X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=0bc114ff869a72c15d55aa7342bdbe396a824a78;hb=34e8c8894f9aa655a87577c946c31a3f9b6134c5;hp=33421783c06d18e11889f1fe9e1ec0092fbfa46c;hpb=d45b35552f4ca1ada1266fb7e8b6968d878019a6;p=rocksndiamonds.git

diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index 33421783..0bc114ff 100644
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -4,13 +4,10 @@
 
 #include "Murphy.h"
 
+
 static void subEatRedDisk(int si);
 static boolean subMoveKillsMurphy(int si, int ax, int bl);
 
-// static char *VB_Name = "modMurphy";
-
-// --- Option Explicit
-
 #if 1
 
 #define LocalStretch 			(2)
@@ -30,14 +27,8 @@ static boolean subMoveKillsMurphy(int si, int ax, int bl);
 
 void subAnimateMurphy(int *si)
 {
-  // int ax, al, ah, bx, bl, i, X, Y;
-  // int tX, tY, tDeltaX, tDeltaY, tPos, Tmp;
-#if 1
   int ax, al, bl, i, X, Y;
   int time1, time2;
-#else
-  int ax, al, bx, bl, i, X, Y;
-#endif
   int tDeltaX, tDeltaY, tPos, Tmp;
 
   // Variables that hold information about the animation sequence
@@ -54,16 +45,6 @@ void subAnimateMurphy(int *si)
   ax = PlayField16[*si];
   al = LowByte(ax);
 
-#if 0
-  printf("::: Murphy.c: subAnimateMurphy(): %d [%d, %d] %d, %d [%d]\n",
-	 *si, *si % 60, *si / 60, ax, al, (al == fiMurphy));
-#endif
-
-#if 0
-  printf("::: Murphy.c: subAnimateMurphy(): %d [%d] [%d]\n",
-	 YawnSleepCounter, FrameCounter, TimerVar);
-#endif
-
   if (al != fiMurphy)
   {
     MurphyMoveCounter = 0;             // We have no Murphy! Exit!
@@ -87,11 +68,14 @@ void subAnimateMurphy(int *si)
   dx2 = -1;
   SeqPos = 0;
   // end of FS
+
   ScratchGravity = 0; // scratch gravity off
   if (GravityFlag != 0) // Gravity? (1=gravity on)
   {
     bl = LowByte(PlayField16[*si - FieldWidth]); // check above
-    if (! (bl == fiPortUp || bl == fiPortUpAndDown || bl == fiPortAllDirections))
+    if (! (bl == fiPortUp ||
+	   bl == fiPortUpAndDown ||
+	   bl == fiPortAllDirections))
     {
       if (PlayField16[*si + FieldWidth] == 0) // gravity on and space below!
         ScratchGravity = 1;
@@ -1175,7 +1159,6 @@ loc_g_6756:
     if (UpdateTimeFlag != 0)    // update time?
     {
       UpdatedFlag = 1; // prevent double update
-      subUpdatePlayingTime();    // update playing time
     }
   }
 
@@ -2055,7 +2038,6 @@ loc_g_6EBA:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_6EC8: // space, base
   PlayField16[*si] = fiMurphy;
   subAdjustZonksInfotronsAboveMurphy(*si + FieldWidth);
@@ -2070,7 +2052,6 @@ loc_g_6ED8:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_6EE6: // space, base
   PlayField16[*si] = fiMurphy;
   subAdjustZonksInfotronsAboveMurphy(*si + 1);
@@ -2085,7 +2066,6 @@ loc_g_6EF6:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_6F04: // space, base
   if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
     PlayField16[*si - FieldWidth] = 0;
@@ -2102,7 +2082,6 @@ loc_g_71B6:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_71C4: // space, base
   subAdjustZonksInfotronsAboveMurphy(*si - 1);
   PlayField16[*si] = fiMurphy;
@@ -2117,7 +2096,6 @@ loc_g_71D4:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_71E2: // base
   if (LowByte(PlayField16[*si - FieldWidth]) != fiExplosion)
     PlayField16[*si - FieldWidth] = 0;
@@ -2132,7 +2110,6 @@ loc_g_71F0:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_71FE: // base
   if (LowByte(PlayField16[*si - 1]) != fiExplosion)
     PlayField16[*si - 1] = 0;
@@ -2147,7 +2124,6 @@ loc_g_720C:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_721A: // base
   if (LowByte(PlayField16[*si + FieldWidth]) != fiExplosion)
     PlayField16[*si + FieldWidth] = 0;
@@ -2162,7 +2138,6 @@ loc_g_7228:
   if (0 < LowByte(InfotronsNeeded))
     InfotronsNeeded = InfotronsNeeded - 1;
 
-  subDisplayInfotronsNeeded();
 loc_g_7236: // base
   if (LowByte(PlayField16[*si + 1]) != fiExplosion)
     PlayField16[*si + 1] = 0;
@@ -2643,7 +2618,6 @@ loc_g_747F:
   PlayField16[*si] = fiMurphy;
   RedDiskReleasePhase = 2;
   RedDiskCount = RedDiskCount - 1;
-  subDisplayRedDiskCount();
 
 #if 1
   subSoundFX(*si, fiRedDisk, actDropping);
@@ -2844,7 +2818,6 @@ static void subEatRedDisk(int si)
   }
 
   RedDiskCount = (RedDiskCount + 1) % 256;
-  subDisplayRedDiskCount();
 }
 
 void subAdjustZonksInfotronsAboveMurphy(int si)