rnd-20090731-1-src

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

diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index 1d3c74c102544040060d88964bc4e2d8f661c213..9ce921b380f9ff74446746c8a1ad70757e8ae2e8 100644 (file)
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -11,7 +11,17 @@ static boolean subMoveKillsMurphy(int si, int ax, int bl);
 
 // --- Option Explicit
 
+#if 1
+
+#define LocalStretch                   (2)
+#define MurphyZoomFactor               (ZoomFactor)
+
+#else
+
 #define LocalStretch                   (1)
+#define MurphyZoomFactor               (1)
+
+#endif
 
 // ==========================================================================
 //                              SUBROUTINE
@@ -39,7 +49,7 @@ int subAnimateMurphy(int *si)
   ax = PlayField16[*si];
   al = LowByte(ax);
 
-#if 1
+#if 0
   printf("::: Murphy.c: subAnimateMurphy(): %d [%d, %d] %d, %d [%d]\n",
         *si, *si % 60, *si / 60, ax, al, (al == fiMurphy));
 #endif
@@ -78,6 +88,10 @@ int subAnimateMurphy(int *si)
   if (bl != 0) // a key was pressed!
     goto locKeyPressed5FCF;
 
+#if 0
+  printf("::: Murphy.c: !!! %d [%d]\n", DemoKeyCode, GravityFlag);
+#endif
+
   RedDiskReleaseFlag = 1;
   if (ScratchGravity != 0) // gravity pulls & space below?'-> force Space up to down
   {
@@ -917,6 +931,10 @@ loc_g_6756:
   if (LowByte(InfotronsNeeded) != 0)
     return subAnimateMurphy;
 
+#if 1
+  printf("::: Murphy.c: !!!!!!!!!! GAME SOLVED !!!!!!!!!!\n");
+#endif
+
   subSoundFXExit();
   data_h_DemoDone = 1; // EP set level success bytes
   LevelStatus = 1; // set Level Status DONE
@@ -1164,8 +1182,14 @@ loc_g_6A1F:
   // We only correct Murphies x-location here, when the sequence starts.
   // Remember that this is not the real bug-fix, but we must live with
   // this existing bug and correct for the consequences of it.
+
+#if 1
+  if (0 == AllowEatRightRedDiskBug) // Murphy's screen x-position
+    MurphyScreenXPos = MurphyScreenXPos - 2 * MurphyZoomFactor;
+#else
   if (0 == AllowEatRightRedDiskBug) // Murphy's screen x-position
     MurphyScreenXPos = MurphyScreenXPos - 2;
+#endif
 
   SeqPos = -1;
   // FS: for me this means to blit the first animation frame twice
@@ -1390,10 +1414,26 @@ loc_g_6C8F:
   {
     // ++++++++++++++++++++++++++
     // Begin of normal movement
+#if 1
+    MurphyScreenXPos = MurphyScreenXPos + MurphyDX * MurphyZoomFactor;
+    MurphyScreenYPos = MurphyScreenYPos + MurphyDY * MurphyZoomFactor;
+#else
     MurphyScreenXPos = MurphyScreenXPos + MurphyDX;
     MurphyScreenYPos = MurphyScreenYPos + MurphyDY;
+#endif
+
+#if 1
+    if (!(ClearPos < 0)) // clear field that murphy is leaving
+      subCopyFieldToScreen(ClearPos, 0);
+#else
     if (! ClearPos < 0) // clear field that murphy is leaving
       subCopyFieldToScreen(ClearPos, 0);
+#endif
+
+#if 0
+    printf("::: ---------------> %d, %d [%d, %d]\n",
+          MurphyScreenXPos, MurphyScreenYPos, MurphyDX, MurphyDY);
+#endif
 
     if (dx2 == fiInfotron) // special case of infotron moving left or right
     {
@@ -1410,7 +1450,12 @@ loc_g_6C8F:
     Y = GetStretchY(dxPos) + tDeltaY;
     Tmp = (SeqPos < 0 ?  0 :  0); // 9StepBugFix!(red disk move right)
     StretchedSprites.BltEx(X, Y, dx[Tmp]);
+
+#if 1
+    if (!(dx2 < 0))
+#else
     if (! dx2 < 0)
+#endif
     {
       tPos = dxPos + dx2Step;
       X = GetStretchX(tPos);
@@ -1432,8 +1477,13 @@ loc_g_6C8F:
   {
     // ++++++++++++++++++++++++++++++++
     // Begin of split movement (port)
+#if 1
+    MurphyScreenXPos = MurphyScreenXPos + 2 * MurphyDX * MurphyZoomFactor;
+    MurphyScreenYPos = MurphyScreenYPos + 2 * MurphyDY * MurphyZoomFactor;
+#else
     MurphyScreenXPos = MurphyScreenXPos + 2 * MurphyDX;
     MurphyScreenYPos = MurphyScreenYPos + 2 * MurphyDY;
+#endif
     subCopyFieldToScreen(ClearPos, 0); // clear the field that murphy leaves
     tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
     tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);