rnd-20100315-3-src

[rocksndiamonds.git] / src / game_sp / Display.c

diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c
index b34ffa530ac5e6db20b00704d390785dc4f733a8..32923d6340f998538ee3aa0b184d3dce12418c30 100644 (file)
--- a/src/game_sp/Display.c
+++ b/src/game_sp/Display.c
@@ -4,13 +4,10 @@
 
 #include "Display.h"
 
-static char *VB_Name = "modDisplay";
-// --- Option Explicit
 
 int ScreenScrollXPos, ScreenScrollYPos;
-int ScreenPosition, data_h_Xtmp, data_h_Ytmp;
 
-int ShowRedDiskCounter, ShowPanel;
+int ShowPanel;
 int ExplosionShake;
 boolean NoDisplayFlag;
 
@@ -18,91 +15,22 @@ long DisplayMinX, DisplayMaxX, DisplayWidth;
 long DisplayMinY, DisplayMaxY, DisplayHeight;
 
 
-int subDisplayInfotronsNeeded()
+void subDisplayLevel()
 {
-  int subDisplayInfotronsNeeded;
-
-  if (NoDisplayFlag)
-    return subDisplayInfotronsNeeded;
-
-  {
-#if 0
-    MainForm.lblInfoCount.Caption = InfotronsNeeded;
-    MainForm.lblInfoCount.Refresh;
-#endif
-  }
-
-  return subDisplayInfotronsNeeded;
-}
-
-int subDisplayPlayingTime()
-{
-  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;
 
@@ -116,6 +44,7 @@ void ScrollTo(int X, int Y)
   Y = Min(Y, ScrollMaxY);
   //  ScrollX = X
   //  ScrollY = Y
+
   Stage.ScrollTo(X, Y);
 }
 
@@ -136,7 +65,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)
@@ -156,5 +86,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);
 }