fixed bug not updating game panel values in visible warp forward mode

diff --git a/ChangeLog b/ChangeLog
index 94150bbfa7ddac70ac77fe0f6bb13f9a1136a6ac..089350374e51fdc65af682d71580000a1f437328 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-02-11
+       * fixed bug not updating game panel values in visible warp forward mode
+
 2015-02-10
        * changed position of CE/GE use/save template gadgets to be visually
          separated from other CE/GE gadgets (to prevent accidental use)

diff --git a/src/game.c b/src/game.c
index cacf857b4dba76576bdf07575af52930baa29cbd..57c7b87326383a566c1e09974e3d4d1aafa928e8 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -2575,7 +2575,7 @@ void DisplayGameControlValues()
 
 void UpdateAndDisplayGameControlValues()
 {
-  if (tape.warp_forward)
+  if (tape.deactivate_display)
     return;
 
   UpdateGameControlValues();

diff --git a/src/game_em/export.h b/src/game_em/export.h
index 7efbfc3bb02a978a7d06c2f406eb35de11ee86a8..61e95b45451e3651b98f5e294c8abffaad05ea51 100644 (file)
--- a/src/game_em/export.h
+++ b/src/game_em/export.h
@@ -740,7 +740,6 @@ extern boolean LoadNativeLevel_EM(char *, boolean);
 extern void BackToFront_EM(void);
 extern void BlitScreenToBitmap_EM(Bitmap *);
 extern void RedrawPlayfield_EM(boolean);
-extern void DrawGameDoorValues_EM();
 
 extern void LoadEngineSnapshotValues_EM();
 extern void SaveEngineSnapshotValues_EM();

diff --git a/src/game_em/global.h b/src/game_em/global.h
index 0bad3d3da7634e4e8efe0628362a5e5663e9e754..b3c5ceaa266ae529f0895d2fcc123297b210d924 100644 (file)
--- a/src/game_em/global.h
+++ b/src/game_em/global.h
@@ -31,8 +31,6 @@ void blitscreen(void);
 void game_initscreen(void);
 void game_animscreen(void);
 
-void DrawGameDoorValues_EM();
-
 void play_sound(int, int, int);
 void sound_play(void);
 

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index 2a624af2a7a7e52ef4d02a591a8e8be4af0c3dbc..860cb36513544eaa4972a6d29e7569d18d5ac99c 100644 (file)
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -834,7 +834,3 @@ void game_animscreen(void)
 {
   RedrawPlayfield_EM(FALSE);
 }
-
-void DrawGameDoorValues_EM()
-{
-}

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 308706437401106672e803f8ad683fae9b7020fa..7b3ae9214f65e38dc40f97ed3d925bd32a0d8ddd 100644 (file)
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -66,6 +66,10 @@ void InitGameEngine_EM()
   game_animscreen();
 }
 
+void UpdateGameDoorValues_EM()
+{
+}
+
 void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 {
   int i;
@@ -91,8 +95,7 @@ void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
     synchro_3();
     sound_play();
 
-    if (!warp_mode)            /* do not redraw values in warp mode */
-      DrawGameDoorValues_EM();
+    UpdateGameDoorValues_EM();
   }
 
   for (i = 0; i < MAX_PLAYERS; i++)

diff --git a/src/game_sp/export.h b/src/game_sp/export.h
index 42d014206a75c0d43ae58e4060c17a84f536577f..3da95312c6addd3e4ac1f81e07211a89a3c43abf 100644 (file)
--- a/src/game_sp/export.h
+++ b/src/game_sp/export.h
@@ -190,7 +190,6 @@ extern void SaveNativeLevel_SP(char *);
 extern void BackToFront_SP(void);
 extern void BlitScreenToBitmap_SP(Bitmap *);
 extern void RedrawPlayfield_SP(boolean);
-extern void DrawGameDoorValues_SP();
 
 extern void LoadEngineSnapshotValues_SP();
 extern void SaveEngineSnapshotValues_SP();

diff --git a/src/game_sp/main.c b/src/game_sp/main.c
index 4486656ffd7864693ad47dec5923f471bb0c5d24..efe66ad90b9784cbebbea7d7d4c235b93f0aaa0a 100644 (file)
--- a/src/game_sp/main.c
+++ b/src/game_sp/main.c
@@ -62,7 +62,7 @@ void RedrawPlayfield_SP(boolean force_redraw)
   BackToFront_SP();
 }
 
-void DrawGameDoorValues_SP()
+void UpdateGameDoorValues_SP()
 {
   game_sp.time_played = TimerVar / FRAMES_PER_SECOND;
   game_sp.infotrons_still_needed = InfotronsNeeded;
@@ -81,8 +81,7 @@ void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
 
   RedrawPlayfield_SP(FALSE);
 
-  if (!warp_mode)              /* do not redraw values in warp mode */
-    DrawGameDoorValues_SP();
+  UpdateGameDoorValues_SP();
 
   CheckSingleStepMode_SP(PlayField16[MurphyPosIndex] == fiMurphy,
                         HighByte(PlayField16[MurphyPosIndex]) == 0x2A);