X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDisplay.c;h=ceaf64423d5a6673bfe9e233485ba5982d2598bb;hb=ce0bba1a070e5e64939491eb68087f68ef8fe870;hp=f8da42e783e5b7e8823670bec53cbad034d57b83;hpb=8d3d7d213a9691455a49544624bf380e85f43461;p=rocksndiamonds.git

diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c
index f8da42e7..ceaf6442 100644
--- a/src/game_sp/Display.c
+++ b/src/game_sp/Display.c
@@ -4,14 +4,11 @@
 
 #include "Display.h"
 
-// static char *VB_Name = "modDisplay";
-
-// --- Option Explicit
 
 int ScreenScrollXPos, ScreenScrollYPos;
-int ScreenPosition, data_h_Xtmp, data_h_Ytmp;
+int ScreenPosition;
 
-int ShowRedDiskCounter, ShowPanel;
+int ShowPanel;
 int ExplosionShake;
 boolean NoDisplayFlag;
 
@@ -19,91 +16,22 @@ long DisplayMinX, DisplayMaxX, DisplayWidth;
 long DisplayMinY, DisplayMaxY, DisplayHeight;
 
 
-int subDisplayInfotronsNeeded()
-{
-  int subDisplayInfotronsNeeded;
-
-  if (NoDisplayFlag)
-    return subDisplayInfotronsNeeded;
-
-  {
-#if 0
-    MainForm.lblInfoCount.Caption = InfotronsNeeded;
-    MainForm.lblInfoCount.Refresh;
-#endif
-  }
-
-  return subDisplayInfotronsNeeded;
-}
-
-int subDisplayPlayingTime()
+void subDisplayLevel()
 {
-  int subDisplayPlayingTime;
-
-
-  return subDisplayPlayingTime;
-}
-
-int subDisplayLevel()
-{
-  int subDisplayLevel;
-
   if (NoDisplayFlag || ! LevelLoaded)
-    return subDisplayLevel;
-
-#if 0
-  MainForm.DisplayLevel();
-#endif
-
-  return subDisplayLevel;
-}
-
-void subDisplayPanel()
-{
-}
-
-int subCheckRestoreRedDiskCountDisplay()
-{
-  int subCheckRestoreRedDiskCountDisplay;
-
-  if (NoDisplayFlag)
-    return subCheckRestoreRedDiskCountDisplay;
-
-  if (ShowRedDiskCounter == 0)
-    return subCheckRestoreRedDiskCountDisplay;
-
-  ShowRedDiskCounter = ShowRedDiskCounter - 1;
-  if (ShowRedDiskCounter == 0)
-  {
-    {
-#if 0
-      MainForm.lblRedDiskCount.Caption = 0;
-      MainForm.lblRedDiskCount.Refresh;
-#endif
-    }
-  }
-
-  return subCheckRestoreRedDiskCountDisplay;
-}
-
-void subDisplayRedDiskCount()
-{
-  if (NoDisplayFlag)
     return;
 
-  {
-#if 0
-    MainForm.lblRedDiskCount.Caption = RedDiskCount;
-    MainForm.lblRedDiskCount.Refresh;
-#endif
-  }
-  ShowRedDiskCounter = 0x46;
+  DisplayLevel();
 }
 
 void ScrollTo(int X, int Y)
 {
   long oldX, oldY;
 
+#if 0
+  printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y);
+#endif
+
   if (NoDisplayFlag)
     return;
 
@@ -117,6 +45,7 @@ void ScrollTo(int X, int Y)
   Y = Min(Y, ScrollMaxY);
   //  ScrollX = X
   //  ScrollY = Y
+
   Stage.ScrollTo(X, Y);
 }
 
@@ -137,7 +66,8 @@ void ScrollTowards(int X, int Y)
   Y = Min(Y, ScrollMaxY);
   //  ScrollX = X
   //  ScrollY = Y
-  Stage.ScrollTowards(X, Y, 2 * Stretch);
+
+  Stage.ScrollTowards(X, Y, 2 * Stretch * ZoomFactor);
 }
 
 void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
@@ -157,5 +87,6 @@ void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
   Y = Min(Y, ScrollMaxY);
   //  ScrollX = X
   //  ScrollY = Y
+
   Stage.SoftScrollTo(X, Y, TimeMS, FPS);
 }