rnd-20090731-1-src

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

diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c
index b34ffa530ac5e6db20b00704d390785dc4f733a8..2eefc737c8a85f01c18b20cbcc5e70a9c604892d 100644 (file)
--- a/src/game_sp/Display.c
+++ b/src/game_sp/Display.c
@@ -4,7 +4,8 @@
 
 #include "Display.h"
 
-static char *VB_Name = "modDisplay";
+// static char *VB_Name = "modDisplay";
+
 // --- Option Explicit
 
 int ScreenScrollXPos, ScreenScrollYPos;
@@ -50,7 +51,9 @@ int subDisplayLevel()
   if (NoDisplayFlag || ! LevelLoaded)
     return subDisplayLevel;
 
-#if 0
+#if 1
+  DisplayLevel();
+#else
   MainForm.DisplayLevel();
 #endif
 
@@ -103,6 +106,10 @@ 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 +123,7 @@ void ScrollTo(int X, int Y)
   Y = Min(Y, ScrollMaxY);
   //  ScrollX = X
   //  ScrollY = Y
+
   Stage.ScrollTo(X, Y);
 }
 
@@ -126,6 +134,10 @@ void ScrollTowards(int X, int Y)
   if (NoDisplayFlag)
     return;
 
+#if 0
+  printf("::: 1 ---> %d, %d\n", X, Y);
+#endif
+
   oldX = ScrollX;
   oldY = ScrollY;
   X = ScrollDelta * (X / ScrollDelta);
@@ -136,7 +148,16 @@ void ScrollTowards(int X, int Y)
   Y = Min(Y, ScrollMaxY);
   //  ScrollX = X
   //  ScrollY = Y
+
+#if 0
+  printf("::: 2 ---> %d, %d\n", X, Y);
+#endif
+
+#if 1
+  Stage.ScrollTowards(X, Y, 2 * Stretch * ZoomFactor);
+#else
   Stage.ScrollTowards(X, Y, 2 * Stretch);
+#endif
 }
 
 void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
@@ -156,5 +177,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);
 }