Merge branch 'v1-errors' into 'master'

V1 errors See merge request KartKrew/Kart-Public!140
STJr · May 29, 2019 · c96f5db · c96f5db
2 parents 6d4cdfa + b15cea5
commit c96f5db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git 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
@@ -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;