From f13a8935ca1a7eeb3406d02f49b2df1490504017 Mon Sep 17 00:00:00 2001
From: Holger Schemel <info@artsoft.org>
Date: Wed, 11 Feb 2015 20:59:30 +0100
Subject: [PATCH] fixed bug not updating game panel values in visible warp
 forward mode

---
 ChangeLog              | 3 +++
 src/game.c             | 2 +-
 src/game_em/export.h   | 1 -
 src/game_em/global.h   | 2 --
 src/game_em/graphics.c | 4 ----
 src/game_em/input.c    | 7 +++++--
 src/game_sp/export.h   | 1 -
 src/game_sp/main.c     | 5 ++---
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94150bbf..08935037 100644
--- 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 cacf857b..57c7b873 100644
--- 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 7efbfc3b..61e95b45 100644
--- 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 0bad3d3d..b3c5ceaa 100644
--- 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 2a624af2..860cb365 100644
--- 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 30870643..7b3ae921 100644
--- 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 42d01420..3da95312 100644
--- 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 4486656f..efe66ad9 100644
--- 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);
-- 
2.34.1