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

diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c
index ceaf6442..ae9d26ea 100644
--- a/src/game_sp/Display.c
+++ b/src/game_sp/Display.c
@@ -6,14 +6,12 @@
 
 
 int ScreenScrollXPos, ScreenScrollYPos;
-int ScreenPosition;
 
-int ShowPanel;
-int ExplosionShake;
+int ExplosionShake, ExplosionShakeMurphy;
 boolean NoDisplayFlag;
 
-long DisplayMinX, DisplayMaxX, DisplayWidth;
-long DisplayMinY, DisplayMaxY, DisplayHeight;
+int DisplayMinX, DisplayMaxX;
+int DisplayMinY, DisplayMaxY;
 
 
 void subDisplayLevel()
@@ -26,67 +24,45 @@ void subDisplayLevel()
 
 void ScrollTo(int X, int Y)
 {
-  long oldX, oldY;
-
-#if 0
-  printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y);
-#endif
-
   if (NoDisplayFlag)
     return;
 
-  oldX = ScrollX;
-  oldY = ScrollY;
   X = ScrollDelta * (X / ScrollDelta);
   X = Max(X, ScrollMinX);
   X = Min(X, ScrollMaxX);
   Y = ScrollDelta * (Y / ScrollDelta);
   Y = Max(Y, ScrollMinY);
   Y = Min(Y, ScrollMaxY);
-  //  ScrollX = X
-  //  ScrollY = Y
 
-  Stage.ScrollTo(X, Y);
+  DDScrollBuffer_ScrollTo(X, Y);
 }
 
 void ScrollTowards(int X, int Y)
 {
-  long oldX, oldY;
-
   if (NoDisplayFlag)
     return;
 
-  oldX = ScrollX;
-  oldY = ScrollY;
   X = ScrollDelta * (X / ScrollDelta);
   X = Max(X, ScrollMinX);
   X = Min(X, ScrollMaxX);
   Y = ScrollDelta * (Y / ScrollDelta);
   Y = Max(Y, ScrollMinY);
   Y = Min(Y, ScrollMaxY);
-  //  ScrollX = X
-  //  ScrollY = Y
 
-  Stage.ScrollTowards(X, Y, 2 * Stretch * ZoomFactor);
+  DDScrollBuffer_ScrollTowards(X, Y, 2 * ZoomFactor);
 }
 
-void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
+void SoftScrollTo(int X, int Y, int TimeMS, int FPS)
 {
-  long oldX, oldY;
-
   if (NoDisplayFlag)
     return;
 
-  oldX = ScrollX;
-  oldY = ScrollY;
   X = ScrollDelta * (X / ScrollDelta);
   X = Max(X, ScrollMinX);
   X = Min(X, ScrollMaxX);
   Y = ScrollDelta * (Y / ScrollDelta);
   Y = Max(Y, ScrollMinY);
   Y = Min(Y, ScrollMaxY);
-  //  ScrollX = X
-  //  ScrollY = Y
 
-  Stage.SoftScrollTo(X, Y, TimeMS, FPS);
+  DDScrollBuffer_SoftScrollTo(X, Y, TimeMS, FPS);
 }