From 6ee807f225c029b1e0e76c6f88f28f8a3934bda4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 6 Nov 2019 17:57:10 +0100 Subject: [PATCH] - two things I forgot to save before committing. --- source/duke3d/src/gamevars.cpp | 2 +- source/rr/src/game.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/duke3d/src/gamevars.cpp b/source/duke3d/src/gamevars.cpp index 2903cd639..92f773388 100644 --- a/source/duke3d/src/gamevars.cpp +++ b/source/duke3d/src/gamevars.cpp @@ -141,7 +141,7 @@ int Gv_ReadSave(FileReader &kFile) if (aGameVars[i].flags & GAMEVAR_PERPLAYER) { aGameVars[i].pValues = (intptr_t*)Xaligned_alloc(PLAYER_VAR_ALIGNMENT, MAXPLAYERS * sizeof(intptr_t)); - if (kFile.Read(aGameVars[i].pValues,sizeof(intptr_t) * MAXPLAYERS) != sizeof(intptr_t) * MAXPLAYERS)) goto corrupt; + if (kFile.Read(aGameVars[i].pValues,sizeof(intptr_t) * MAXPLAYERS) != sizeof(intptr_t) * MAXPLAYERS) goto corrupt; } else if (aGameVars[i].flags & GAMEVAR_PERACTOR) { diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp index 84bfe8c14..f94cc2bea 100644 --- a/source/rr/src/game.cpp +++ b/source/rr/src/game.cpp @@ -7973,8 +7973,6 @@ MAIN_LOOP_RESTART: goto MAIN_LOOP_RESTART; } while (1); - - return 0; // not reached (duh) } GAME_STATIC GAME_INLINE int32_t G_MoveLoop()