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

diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c
index d75db7b9..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,92 +16,21 @@ 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;
+    return;
 
-#if 1
   DisplayLevel();
-#else
-  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()
+void ScrollTo(int X, int Y)
 {
-  if (NoDisplayFlag)
-    return;
+  long oldX, oldY;
 
-  {
 #if 0
-    MainForm.lblRedDiskCount.Caption = RedDiskCount;
-    MainForm.lblRedDiskCount.Refresh;
+  printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y);
 #endif
-  }
-  ShowRedDiskCounter = 0x46;
-}
-
-void ScrollTo(int X, int Y)
-{
-  long oldX, oldY;
 
   if (NoDisplayFlag)
     return;
@@ -141,21 +67,13 @@ void ScrollTowards(int X, int Y)
   //  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)
 {
   long oldX, oldY;
 
-#if 1
-  printf("::: 1: Display.c: SoftScrollTo: X,Y == %d, %d\n", X, Y);
-  printf("::: %d, %d, %d, %d [%ld]\n",
-	 ScrollMinX, ScrollMaxX,
-	 ScrollMinY, ScrollMaxY,
-	 ScrollDelta);
-#endif
-
   if (NoDisplayFlag)
     return;
 
@@ -170,9 +88,5 @@ void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
   //  ScrollX = X
   //  ScrollY = Y
 
-#if 1
-  printf("::: 2: Display.c: SoftScrollTo: X,Y == %d, %d\n", X, Y);
-#endif
-
   Stage.SoftScrollTo(X, Y, TimeMS, FPS);
 }