X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=849e685cef5cc7df62d96a63a42ed6948f50258b;hb=18863a5655e9e07d548e2d673e7f82336703c8fb;hp=ff03ea27091dcce2321efc97d0223848134792c3;hpb=3d31c6dd1b4f598453c3079d292f47f372f10151;p=rocksndiamonds.git

diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index ff03ea27..849e685c 100644
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -1073,12 +1073,12 @@ loc_g_6756:
     return;
 
 #if 1
-  if (!game_sp_info.LevelSolved)
+  if (!game_sp.LevelSolved)
     printf("::: Murphy.c: !!!!!!!!!! LEVEL %d SOLVED !!!!!!!!!!\n",LevelNumber);
 #endif
 
 #if 1
-  game_sp_info.LevelSolved = TRUE;
+  game_sp.LevelSolved = TRUE;
 #endif
 
   subSoundFXExit();
@@ -1161,7 +1161,11 @@ loc_g_6817:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si - FieldWidth)][GetY(*si - FieldWidth)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si - FieldWidth, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si - FieldWidth, 0x88); // draw new terminal type
 #endif
@@ -1183,7 +1187,11 @@ loc_g_684E:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si - 1)][GetY(*si - 1)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si - 1, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si - 1, 0x88); // draw new terminal type
 #endif
@@ -1205,7 +1213,11 @@ loc_g_6884:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si + FieldWidth)][GetY(*si + FieldWidth)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si + FieldWidth, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si + FieldWidth, 0x88); // draw new terminal type
 #endif
@@ -1227,7 +1239,11 @@ loc_g_68BA:
 
 #if 1
   // draw new terminal type
+#if 1
+  GfxGraphic[GetX(*si + 1)][GetY(*si + 1)] = aniTerminalActive;
+#else
   subCopyImageToScreen(*si + 1, aniTerminalActive);
+#endif
 #else
   subCopyFieldToScreen(*si + 1, 0x88); // draw new terminal type
 #endif
@@ -1675,12 +1691,15 @@ loc_g_6C8F:
 	   MurphyScreenXPos, MurphyScreenYPos, MurphyDX, MurphyDY);
 #endif
 
+#if 0
+    // !!! special two-tile animation currently not used !!!
     if (dx2 == fiInfotron) // special case of infotron moving left or right
     {
       tDeltaX = 0;
       tDeltaY = 0;
     }
     else
+#endif
     {
       tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
       tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
@@ -1697,6 +1716,8 @@ loc_g_6C8F:
 
 #if 1
     StretchedSprites.BltImg(X, Y, dx1, Tmp);
+    GfxGraphic[GetX(*si)][GetY(*si)] = -1;	// (Murphy's position)
+    GfxGraphic[GetX(dxPos)][GetY(dxPos)] = -1;	// (snapping position)
     // printf("::: Tmp: %d\n", Tmp);
 #else
     StretchedSprites.BltEx(X, Y, dx[Tmp]);
@@ -1711,11 +1732,14 @@ loc_g_6C8F:
       tPos = dxPos + dx2Step;
       X = GetStretchX(tPos);
       Y = GetStretchY(tPos);
+#if 0
+    // !!! special two-tile animation currently not used !!!
       if (dx2 == fiInfotron) // special case of infotron moving left or right
       {
         StretchedSprites.BltEx(X, Y, dx[SeqPos] + dx2Step);
       }
       else // pushing something
+#endif
       {
 #if 1
 	// (SeqPos iterates from 0 to 7 while pushing)
@@ -1746,12 +1770,21 @@ loc_g_6C8F:
     tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
     X = GetStretchX(dxPos) + tDeltaX;
     Y = GetStretchY(dxPos) + tDeltaY;
+#if 1
+    StretchedSprites.BltImg(X, Y, dx1, SeqPos); // plot first murphy
+#else
     StretchedSprites.BltEx(X, Y, dx[SeqPos]); // plot first murphy
+#endif
     tPos = dxPos + dx2Step;
     X = GetStretchX(tPos);
     Y = GetStretchY(tPos);
+#if 1
+    StretchedSprites.BltImg(X + tDeltaX, Y + tDeltaY, dx1, SeqPos); // plot second murphy
+    StretchedSprites.BltImg(X, Y, fiGraphic[LowByte(PlayField16[tPos])], 0); // replot the port on top
+#else
     StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx[SeqPos]); // plot second murphy
     StretchedSprites.BltEx(X, Y, LowByte(PlayField16[tPos])); // replot the port on top
+#endif
     // End of split movement (port)
     // ------------------------------
   } // loc_g_6D1E:'loc_g_6D28:
@@ -2650,6 +2683,8 @@ int subSpPortTest(int si)
   return subSpPortTest;
 } // subSpPortTest
 
+#if 0
+
 void subCopyFieldToScreen(int si, int fi)
 {
   int X, Y;
@@ -2661,6 +2696,8 @@ void subCopyFieldToScreen(int si, int fi)
   // +++++++++++++++++++++++++++++++++++++++++
 }
 
+#endif
+
 void subCopyAnimToScreen(int si, int graphic, int sync_frame)
 {
   int X, Y;