rnd-20100417-2-src

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

diff --git a/src/game_sp/MainGameLoop.c b/src/game_sp/MainGameLoop.c
index a82c8732f4846393e958441d10db97067b2a1528..2a6d25515b21287fff51ec4edb236d1f1f8e7525 100644 (file)
--- a/src/game_sp/MainGameLoop.c
+++ b/src/game_sp/MainGameLoop.c
@@ -6,7 +6,7 @@
 
 
 boolean bPlaying;
-int LeadOutCounter, EnterRepeatCounter;
+int LeadOutCounter;
 int ExitToMenuFlag;
 boolean AutoScrollFlag;
 
@@ -98,7 +98,7 @@ locExitMainGameLoop:
 
 void subCalculateScreenScrollPos()
 {
-  int ax, Ay;
+  int ax, ay;
 
 #if 1
   int jump_pos = TILEX / 2;
@@ -122,11 +122,17 @@ void subCalculateScreenScrollPos()
     // printf("::: ExplosionShake [%d]\n", FrameCounter);
   }
 
-  {
-    ax = SXSIZE / 2;
-    Ay = SYSIZE / 2;
-  }
+#if 1
+  ax = (SCR_FIELDX / 2) * TILESIZE;
+  ay = (SCR_FIELDY / 2) * TILESIZE;
 
-  ScreenScrollXPos = Stretch * (MurphyScreenXPos + TILEX / 2) - ax;
-  ScreenScrollYPos = Stretch * (MurphyScreenYPos + TILEY / 2) - Ay;
+  ScreenScrollXPos = MurphyScreenXPos - ax;
+  ScreenScrollYPos = MurphyScreenYPos - ay;
+#else
+  ax = SXSIZE / 2;
+  ay = SYSIZE / 2;
+
+  ScreenScrollXPos = (MurphyScreenXPos + TILEX / 2) - ax;
+  ScreenScrollYPos = (MurphyScreenYPos + TILEY / 2) - ay;
+#endif
 }