From: Holger Schemel Date: Tue, 30 Oct 2018 19:15:42 +0000 (+0100) Subject: changed variable name X-Git-Tag: 4.1.2.0~116 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c40a5c6109e586ce4049ca0900e5fb9c9ac60fb7;p=rocksndiamonds.git changed variable name --- diff --git a/src/game.c b/src/game.c index 2fb1b686..a780952b 100644 --- a/src/game.c +++ b/src/game.c @@ -11134,17 +11134,17 @@ static void CheckLevelSolved(void) } else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) { - if (game_sp.LevelSolved && - !game_sp.GameOver) // game won + if (game_sp.level_solved && + !game_sp.game_over) // game won { PlayerWins(local_player); - game_sp.GameOver = TRUE; + game_sp.game_over = TRUE; AllPlayersGone = TRUE; } - if (game_sp.GameOver) // game lost + if (game_sp.game_over) // game lost AllPlayersGone = TRUE; } else if (level.game_engine_type == GAME_ENGINE_TYPE_MM) @@ -15043,7 +15043,7 @@ boolean checkGameFailed(void) if (level.game_engine_type == GAME_ENGINE_TYPE_EM) return (level.native_em_level->lev->home > 0); else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) - return (game_sp.GameOver && !game_sp.LevelSolved); + return (game_sp.game_over && !game_sp.level_solved); else if (level.game_engine_type == GAME_ENGINE_TYPE_MM) return (game_mm.game_over && !game_mm.level_solved); else // GAME_ENGINE_TYPE_RND diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c index fbea5551..79b102d6 100644 --- a/src/game_sp/DoGameStuff.c +++ b/src/game_sp/DoGameStuff.c @@ -71,8 +71,8 @@ void subDoGameStuff(void) if (KillMurphyFlag == 1 || MurphyMoveCounter == 0) { if (LeadOutCounter == 0 && - !game_sp.LevelSolved && - !game_sp.GameOver) + !game_sp.level_solved && + !game_sp.game_over) { KillMurphyFlag = 0; // no more "kill Murphy" ExplodeFieldSP(MurphyExplodePos); // Explode diff --git a/src/game_sp/MainGameLoop.c b/src/game_sp/MainGameLoop.c index 72d0e283..e1a20b10 100644 --- a/src/game_sp/MainGameLoop.c +++ b/src/game_sp/MainGameLoop.c @@ -75,8 +75,8 @@ void subMainGameLoop_Main(byte action, boolean warp_mode) // ---------------------- END OF GAME-BUSY LOOP (including lead-out) --------- // if the game is not won when reaching this point, then it is lost - if (!game_sp.LevelSolved) - game_sp.GameOver = TRUE; + if (!game_sp.level_solved) + game_sp.game_over = TRUE; } void subCalculateScreenScrollPos(void) diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c index c0a148fd..39826cbc 100644 --- a/src/game_sp/Murphy.c +++ b/src/game_sp/Murphy.c @@ -962,7 +962,7 @@ loc_g_6756: if (LowByte(InfotronsNeeded) != 0) return; - game_sp.LevelSolved = TRUE; + game_sp.level_solved = TRUE; subSoundFX(*si, fiExit, actPassing); diff --git a/src/game_sp/export.h b/src/game_sp/export.h index 1ac2d311..787bb45b 100644 --- a/src/game_sp/export.h +++ b/src/game_sp/export.h @@ -91,8 +91,8 @@ struct GlobalInfo_SP struct GameInfo_SP { - boolean LevelSolved; - boolean GameOver; + boolean level_solved; + boolean game_over; // needed for updating panel int time_played; diff --git a/src/game_sp/main.c b/src/game_sp/main.c index 02eeea93..2a79f6da 100644 --- a/src/game_sp/main.c +++ b/src/game_sp/main.c @@ -18,8 +18,8 @@ void InitGameEngine_SP(void) gfx.anim_random_frame = -1; // (use simple, ad-hoc random numbers) - game_sp.LevelSolved = FALSE; - game_sp.GameOver = FALSE; + game_sp.level_solved = FALSE; + game_sp.game_over = FALSE; game_sp.time_played = 0; game_sp.infotrons_still_needed = native_sp_level.header.InfotronsNeeded;