From owner-svn-ports-head@freebsd.org Mon Feb 4 06:48:34 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CEB4114C0D79; Mon, 4 Feb 2019 06:48:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C2907074E; Mon, 4 Feb 2019 06:48:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 545DE2440; Mon, 4 Feb 2019 06:48:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x146mYZ6018874; Mon, 4 Feb 2019 06:48:34 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x146mX30018872; Mon, 4 Feb 2019 06:48:33 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201902040648.x146mX30018872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 4 Feb 2019 06:48:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492100 - head/games/alex4/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/alex4/files X-SVN-Commit-Revision: 492100 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6C2907074E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.93)[-0.934,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Feb 2019 06:48:35 -0000 Author: tobik Date: Mon Feb 4 06:48:33 2019 New Revision: 492100 URL: https://svnweb.freebsd.org/changeset/ports/492100 Log: games/alex4: Prepare for Allegro 4.4.3 Allegro 4.4.3 removed aliases for fsin, fcos, etc. They are also available as fixsin, fixcos, etc., so use them instead. PR: 235477 Modified: head/games/alex4/files/patch-main.c head/games/alex4/files/patch-shooter.c Modified: head/games/alex4/files/patch-main.c ============================================================================== --- head/games/alex4/files/patch-main.c Mon Feb 4 06:45:36 2019 (r492099) +++ head/games/alex4/files/patch-main.c Mon Feb 4 06:48:33 2019 (r492100) @@ -1,4 +1,4 @@ ---- main.c.orig 2016-06-14 16:25:53 UTC +--- main.c.orig 2019-02-04 06:12:31 UTC +++ main.c @@ -38,6 +38,7 @@ #include "main.h" @@ -221,6 +221,18 @@ if (pf) { save_hisc_table(hisc_table, pf); save_hisc_table(hisc_table_space, pf); +@@ -1158,9 +1212,9 @@ void draw_custom_ending(BITMAP *bmp) { + + blit(data[INTRO_BG].dat, bmp, 0, 0, 0, 0, 160, 120); + +- r = 70 + fixtoi(20 * fcos(itofix(game_count >> 1)) + 20 * fsin(itofix((int)(game_count / 2.7))) ); ++ r = 70 + fixtoi(20 * fixcos(itofix(game_count >> 1)) + 20 * fixsin(itofix((int)(game_count / 2.7))) ); + for(i = 0; i < 256; i += 32) +- draw_sprite(bmp, head, 80 - head->w/2 + fixtoi(r * fcos(itofix(game_count + i))), 60 - head->h/2 + fixtoi(r * fsin(itofix(game_count + i)))); ++ draw_sprite(bmp, head, 80 - head->w/2 + fixtoi(r * fixcos(itofix(game_count + i))), 60 - head->h/2 + fixtoi(r * fixsin(itofix(game_count + i)))); + + draw_sprite_h_flip(bmp, data[ALEX].dat, 60, 40); + draw_sprite(bmp, data[LOLA].dat, 84, 40); @@ -1289,7 +1343,7 @@ void show_cutscene(int level) { // poll music machine if (got_sound) al_poll_duh(dp); @@ -230,7 +242,7 @@ mode = 2; } -@@ -1343,7 +1397,7 @@ void show_scores(int space, Thisc *table +@@ -1343,7 +1397,7 @@ void show_scores(int space, Thisc *table) { if (space) { // get space bg packfile_password(init_string); @@ -248,6 +260,15 @@ if (p->actor->status == AC_BALL) { camera_type = 2; +@@ -2485,7 +2539,7 @@ void draw_title(BITMAP *bmp, int tick) { + textout(bmp, data[THE_FONT].dat, "QUIT", x+1, y+1, 1); + textout(bmp, data[THE_FONT].dat, "QUIT", x, y, 4); + +- draw_sprite(bmp, data[POINTER].dat, x - 25 + fixtoi(3 * fcos(itofix(tick << 2))), 44 + menu_choice * step); ++ draw_sprite(bmp, data[POINTER].dat, x - 25 + fixtoi(3 * fixcos(itofix(tick << 2))), 44 + menu_choice * step); + } + + @@ -2841,6 +2895,10 @@ int do_main_menu() { } else { Modified: head/games/alex4/files/patch-shooter.c ============================================================================== --- head/games/alex4/files/patch-shooter.c Mon Feb 4 06:45:36 2019 (r492099) +++ head/games/alex4/files/patch-shooter.c Mon Feb 4 06:48:33 2019 (r492100) @@ -1,5 +1,40 @@ ---- shooter.c.orig 2016-06-14 16:25:53 UTC +--- shooter.c.orig 2019-02-04 06:12:31 UTC +++ shooter.c +@@ -500,12 +500,12 @@ void s_update_object(Tspace_object *o) { + break; + case SM_SIN_WAVE: + o->x += o->vx; +- o->y = o->d2 + fixtoi(fmul(ftofix(o->vy), fsin(itofix(o->t)))); ++ o->y = o->d2 + fixtoi(fixmul(ftofix(o->vy), fixsin(itofix(o->t)))); + o->t += o->d1; + break; + case SM_COS_WAVE: + o->x += o->vx; +- o->y = o->d2 + fixtoi(fmul(ftofix(o->vy), fcos(itofix(o->t)))); ++ o->y = o->d2 + fixtoi(fixmul(ftofix(o->vy), fixcos(itofix(o->t)))); + o->t += o->d1; + break; + case SM_BOSS_1: +@@ -516,8 +516,8 @@ void s_update_object(Tspace_object *o) { + o->tx = o->x; + } + else { +- o->y = o->ty + fixtoi(fmul(ftofix(o->vy), fsin(itofix(o->t)))); +- o->x = o->tx - fixtoi(10 * fsin(itofix(o->t >> 1))); ++ o->y = o->ty + fixtoi(fixmul(ftofix(o->vy), fixsin(itofix(o->t)))); ++ o->x = o->tx - fixtoi(10 * fixsin(itofix(o->t >> 1))); + o->t ++; + } + break; +@@ -573,7 +573,7 @@ void s_update_object(Tspace_object *o) { + else if (o->image == ENEMY15) { + int i; + for(i = 0; i < 256; i += 32) +- s_make_enemy_bullet((int)o->x + o->bw / 2, (int)o->y + o->bh, fixtof(1 * fcos(itofix(i - 6))), fixtof(1 * fsin(itofix(i - 6)))); ++ s_make_enemy_bullet((int)o->x + o->bw / 2, (int)o->y + o->bh, fixtof(1 * fixcos(itofix(i - 6))), fixtof(1 * fixsin(itofix(i - 6)))); + o->fire_counter = 200 + rand()%50; + } + @@ -1372,7 +1372,7 @@ int s_init_shooter() { // load data log2file(" loading shooter data");