X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FBugsTerminals.c;h=b7f7862d95da86049bb6256b68516ea81170d836;hb=949580a3bafe5c8abd1fac99202411b65900b883;hp=4847b92e1a25c843012b5b2032201e2489563e90;hpb=91c0172a97f1323e573684a456de436332c8ea34;p=rocksndiamonds.git

diff --git a/src/game_sp/BugsTerminals.c b/src/game_sp/BugsTerminals.c
index 4847b92e..b7f7862d 100644
--- a/src/game_sp/BugsTerminals.c
+++ b/src/game_sp/BugsTerminals.c
@@ -8,11 +8,14 @@
 
 // --- Option Explicit
 
-long GetTickCount();
+long MyGetTickCount();
 
 byte *TerminalState;
 int TerminalMaxCycles;
+
+#if 0
 #define aniTerminal 			(0x80)
+#endif
 
 // ==========================================================================
 //                              SUBROUTINE
@@ -25,16 +28,35 @@ int subAnimateBugs(int si)
 
   // int ax, bx, cx, dx, di;
   // int ah, bh, ch, dh, al, bl, cl, dl;
-  int cx;
+  // int cx;
+#if 0
+  int graphic, sync_frame;
+#endif
   int bl;
 
   if (fiBug != LowByte(PlayField16[si]))
     return subAnimateBugs;
 
+#if 0
   if (0 != (TimerVar & 3))
     return subAnimateBugs;
+#endif
 
   bl = SgnHighByte(PlayField16[si]); // get and increment sequence#
+
+#if 1
+  if ((TimerVar & 3) == 0)
+  {
+    bl = bl + 1;
+    if (bl >= 0xE)
+    {
+      bl = subGetRandomNumber(); // generate new random number
+      bl = -((bl & 0x3F) + 0x20);
+    }
+
+    MovHighByte(&PlayField16[si], bl); // save sequence#
+  }
+#else
   bl = bl + 1;
   if (bl >= 0xE)
   {
@@ -43,43 +65,90 @@ int subAnimateBugs(int si)
   }
 
   MovHighByte(&PlayField16[si], bl); // save sequence#
+#endif
   if (bl < 0) // bug sleeps / is inactive
     return subAnimateBugs;
 
+#if 1
+  if ((TimerVar & 3) != 0)
+    goto markDisplay;
+#endif
+
   // now the bug is active! Beware Murphy!
-  if ((ByteMask && PlayField16[si - FieldWidth - 1]) == fiMurphy)
+  if ((ByteMask & PlayField16[si - FieldWidth - 1]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si - FieldWidth]) == fiMurphy)
+  if ((ByteMask & PlayField16[si - FieldWidth]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si - FieldWidth + 1]) == fiMurphy)
+  if ((ByteMask & PlayField16[si - FieldWidth + 1]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si - 1]) == fiMurphy)
+  if ((ByteMask & PlayField16[si - 1]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si + 1]) == fiMurphy)
+  if ((ByteMask & PlayField16[si + 1]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si + FieldWidth - 1]) == fiMurphy)
+  if ((ByteMask & PlayField16[si + FieldWidth - 1]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si + FieldWidth]) == fiMurphy)
+  if ((ByteMask & PlayField16[si + FieldWidth]) == fiMurphy)
     goto markPlaySound;
 
-  if ((ByteMask && PlayField16[si + FieldWidth + 1]) == fiMurphy)
+  if ((ByteMask & PlayField16[si + FieldWidth + 1]) == fiMurphy)
     goto markPlaySound;
 
   goto markDisplay;
 
 markPlaySound:
+#if 1
+  subSoundFX(si, fiBug, actActive);	// play dangerous sound
+#else
   subSoundFXBug(); // play dangerous sound
+#endif
 
 markDisplay:
   // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  cx = aniBug[bl];
+#if 1
+
+#if 1
+
+#if 0
+  graphic = (bl == 0  ? aniBugActivating :
+	     bl == 12 ? aniBugDeactivating :
+	     bl == 13 ? aniBug : aniBugActive);
+  sync_frame = (bl >= 1 && bl <= 11 ? (bl - 1) * 4 : 0) + (TimerVar & 3);
+#endif
+
+  // printf("::: %d [%d]\n", sync_frame, gfx.anim_random_frame);
+
+#if 0
+  /* a general random frame treatment would be needed for _all_ animations */
+  /* (DONE) */
+  if (isRandomAnimation_SP(graphic) &&
+      !isNextAnimationFrame_SP(graphic, sync_frame))
+    return subAnimateBugs;
+#endif
+
+#if 1
+
+  GfxGraphic[GetX(si)][GetY(si)] = (bl == 0  ? aniBugActivating :
+				    bl == 12 ? aniBugDeactivating :
+				    bl == 13 ? aniBug : aniBugActive);
+
+#else
+  subCopyAnimToScreen(si, graphic, sync_frame);
+#endif
+
+#else
+  subCopyFieldToScreen(si, aniFramesBug[bl]);
+#endif
+
+#else
+  cx = aniFramesBug[bl];
   StretchedSprites.BltEx(GetStretchX(si), GetStretchY(si), cx);
+#endif
   // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
   return subAnimateBugs;
@@ -94,24 +163,48 @@ int subAnimateTerminals(int si)
   int subAnimateTerminals;
 
   // int bl, ax, al, X, Y;
+#if 1
+  short bl;
+#else
   int bl, al, X, Y;
+#endif
+
+#if 1
+  int lx = GetX(si);
+  int ly = GetY(si);
+  int graphic;
+#endif
 
   if (LowByte(PlayField16[si]) != fiTerminal)
     return subAnimateTerminals;
 
+  /* use native frame handling (undo frame incrementation in main loop) */
+  if (game.use_native_sp_graphics_engine)
+    GfxFrame[lx][ly]--;
+
+  /* get last random animation delay */
   bl = HighByte(PlayField16[si]);
   if ((bl & 0x80) == 0x80)
     bl = (bl | 0xFF00);
 
   bl = bl + 1;
-  if (bl <= 0)
+  if (bl <= 0)		/* return if random animation delay not yet reached */
   {
     MovHighByte(&PlayField16[si], bl);
+
+#if 1
+    if (game.use_native_sp_graphics_engine)
+      return subAnimateTerminals;
+#else
     return subAnimateTerminals;
+#endif
   }
 
+  /* calculate new random animation delay */
   bl = -(subGetRandomNumber() & TerminalMaxCycles); // generate new random number
   MovHighByte(&PlayField16[si], bl); // save new sequence#
+
+  /* check terminal state (active or inactive) */
   bl = TerminalState[si] + 1;
   if (bl == 8)
   {
@@ -123,11 +216,44 @@ int subAnimateTerminals(int si)
   }
 
   TerminalState[si] = bl;
+
   // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#if 1
+
+  graphic = (bl < 8 ? aniTerminal : aniTerminalActive);
+
+  if (game.use_native_sp_graphics_engine)
+    GfxFrame[lx][ly] += getGraphicInfo_Delay(graphic);
+
+#if 1
+
+#if 1
+
+  GfxGraphic[GetX(si)][GetY(si)] = (bl < 8 ? aniTerminal : aniTerminalActive);
+
+#else
+  subCopyAnimToScreen(si, graphic, GfxFrame[lx][ly]);
+#endif
+
+#else
+  X = GetStretchX(si);
+  Y = GetStretchY(si);
+  StretchedSprites.BltImg(X, Y, graphic, GfxFrame[lx][ly]);
+#endif
+
+#else
+
   al = aniTerminal + bl;
+
+#if 1
+  subCopyFieldToScreen(si, al);
+#else
   X = GetStretchX(si);
   Y = GetStretchY(si);
   StretchedSprites.BltEx(X, Y, al);
+#endif
+
+#endif
   // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
   return subAnimateTerminals;
@@ -144,7 +270,7 @@ int subRandomize()
 
   long Tick, Tmp;
 
-  Tick = GetTickCount();
+  Tick = MyGetTickCount();
   Tmp = ((Tick ^ (long)(Tick / (1 << 16))) & 0xFFFF);
   RandomSeed = 0x7FFF & Tmp;
   if ((Tmp & 0x8000) != 0)
@@ -159,6 +285,10 @@ int subRandomize()
   }
 #endif
 
+#if 0
+  printf("::: BugsTerminals.c: ========== subRandomize()\n");
+#endif
+
   return subRandomize;
 } // subRandomize
 
@@ -173,12 +303,29 @@ int subGetRandomNumber()
   int subGetRandomNumber;
 
   long Tmp, RSeed;
+#if 0
+  long Tst;
+#endif
 
   RSeed = (long)(0x7FFF & RandomSeed);
   if (0x8000 == (RandomSeed & 0x8000))
     RSeed = RSeed | 0x8000;
 
+#if 0
+  /* !!! TEST !!! */
+  Tmp = 0xFFFF & (((0x5E5 * RSeed) & 0xFFFF) + 0x31);
+#else
   Tmp = 0xFFFF & (((0x5E5 * RandomSeed) & 0xFFFF) + 0x31);
+#endif
+
+#if 0
+  Tst = 0xFFFF & (((0x5E5 * RSeed) & 0xFFFF) + 0x31);
+  printf("::: BugsTerminals.c: subGetRandomNumber(): %d [%ld] [%ld, %ld]\n",
+	 RandomSeed, RSeed, Tmp, Tst);
+  if (Tmp != Tst)
+    printf("::: !!!!!!!!!!\n");
+#endif
+
   RandomSeed = 0x7FFF & Tmp;
   if ((Tmp & 0x8000) != 0)
     RandomSeed = RandomSeed | 0x8000;
@@ -192,6 +339,15 @@ int subGetRandomNumber()
   //  Mov randomseed, ax
   //  shr ax,1
 
+#if 0
+  printf("::: BugsTerminals.c: ---------- subGetRandomNumber(): %d\n",
+	 subGetRandomNumber);
+#endif
+
+#if 0
+  printf("::: BugsTerminals.c: subGetRandomNumber(): %d [%ld, %d]\n",
+	 subGetRandomNumber, Tmp, RandomSeed);
+#endif
+
   return subGetRandomNumber;
 } // subGetRandomNumber
-