X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2Fmain.c;h=2a79f6da6ae1566f9736d1c738948abc682c7c06;hb=98d421667c21a07ab69dd881f1435c2f595ddd4c;hp=92fc9120dcee90e756c0f12b3f20054e81dcc795;hpb=567cfcb396e3fc031a25362b747dd0a5a096b4ec;p=rocksndiamonds.git diff --git a/src/game_sp/main.c b/src/game_sp/main.c index 92fc9120..2a79f6da 100644 --- a/src/game_sp/main.c +++ b/src/game_sp/main.c @@ -12,14 +12,14 @@ int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT]; int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT]; -void InitGameEngine_SP() +void InitGameEngine_SP(void) { int x, y; 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; @@ -54,13 +54,17 @@ void InitGameEngine_SP() void RedrawPlayfield_SP(boolean force_redraw) { + // skip redrawing playfield in warp mode or when testing tapes with "autotest" + if (DrawingDeactivatedField()) + return; + if (force_redraw) RestorePlayfield(); UpdatePlayfield(force_redraw); } -void UpdateGameDoorValues_SP() +static void UpdateGameDoorValues_SP(void) { game_sp.time_played = TimerVar / FRAMES_PER_SECOND; game_sp.infotrons_still_needed = InfotronsNeeded; @@ -90,7 +94,10 @@ void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode) GfxFrame[x][y]++; } -int getRedDiskReleaseFlag_SP() +int getRedDiskReleaseFlag_SP(void) { + // 0: when Murphy is moving (including the destination tile!) + // 1: when Murphy is not moving for at least one game frame + return RedDiskReleaseFlag; }