From f070bd2d4dd31b3d0c045b90aa42a4b884d9e43c Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 28 May 2019 19:00:24 -0700 Subject: [PATCH 1/2] Fix GCC 8 Travis error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6f8a7aa..6d2e8cdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,7 +107,7 @@ matrix: - p7zip-full - gcc-8 compiler: gcc-8 - env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow" GCC81=1 + env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" GCC81=1 if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ #gcc-8 (Ubuntu 7.2.0-1ubuntu1~14.04) 8.1.0 - os: linux From b15cea53e6c1cd4147e31a3cdb4e555ebc7b73bb Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 28 May 2019 19:03:02 -0700 Subject: [PATCH 2/2] Fix XCode compiler errors I'm faily certain this also fixes broken logic (g_game.c). --- src/g_game.c | 2 +- src/p_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index f29c9787..10bd76ac 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6032,7 +6032,7 @@ void G_ConfirmRewind(tic_t rewindtime) G_DoPlayDemo(NULL); // Restart the current demo - for (j = 0; j < rewindtime && leveltime < rewindtime; i++) + for (j = 0; j < rewindtime && leveltime < rewindtime; j++) { //TryRunTics(1); G_Ticker((j % NEWTICRATERATIO) == 0); diff --git a/src/p_user.c b/src/p_user.c index 0b938b0b..ced8b2da 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7913,7 +7913,7 @@ boolean P_SpectatorJoinGame(player_t *player) static void P_CalcPostImg(player_t *player) { sector_t *sector = player->mo->subsector->sector; - postimg_t *type = postimg_none; + postimg_t *type = NULL; INT32 *param; fixed_t pviewheight; UINT8 i;