X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FBugsTerminals.c;h=70aa7b64b6d34d2bf8b08fb924d5b44e824d221e;hb=61ca162f9268de1fa4fe0df3f561189b1a71770d;hp=4847b92e1a25c843012b5b2032201e2489563e90;hpb=91c0172a97f1323e573684a456de436332c8ea34;p=rocksndiamonds.git diff --git a/src/game_sp/BugsTerminals.c b/src/game_sp/BugsTerminals.c index 4847b92e..70aa7b64 100644 --- a/src/game_sp/BugsTerminals.c +++ b/src/game_sp/BugsTerminals.c @@ -8,7 +8,7 @@ // --- Option Explicit -long GetTickCount(); +long MyGetTickCount(); byte *TerminalState; int TerminalMaxCycles; @@ -94,24 +94,48 @@ int subAnimateTerminals(int si) int subAnimateTerminals; // int bl, ax, al, X, Y; +#if 1 + short bl, al, X, Y; +#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) { @@ -122,12 +146,23 @@ int subAnimateTerminals(int si) bl = 8; } +#if 1 + graphic = (bl < 8 ? IMG_SP_TERMINAL : IMG_SP_TERMINAL_ACTIVE); + + if (game.use_native_sp_graphics_engine) + GfxFrame[lx][ly] += getGraphicInfo_Delay(graphic); +#endif + TerminalState[si] = bl; // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ al = aniTerminal + bl; X = GetStretchX(si); Y = GetStretchY(si); +#if 1 + StretchedSprites.BltImg(X, Y, graphic, GfxFrame[lx][ly]); +#else StretchedSprites.BltEx(X, Y, al); +#endif // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ return subAnimateTerminals; @@ -144,7 +179,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 +194,10 @@ int subRandomize() } #endif +#if 0 + printf("::: BugsTerminals.c: ========== subRandomize()\n"); +#endif + return subRandomize; } // subRandomize @@ -178,7 +217,12 @@ int subGetRandomNumber() if (0x8000 == (RandomSeed & 0x8000)) RSeed = RSeed | 0x8000; +#if 0 + /* !!! TEST !!! */ + Tmp = 0xFFFF & (((0x5E5 * RSeed) & 0xFFFF) + 0x31); +#else Tmp = 0xFFFF & (((0x5E5 * RandomSeed) & 0xFFFF) + 0x31); +#endif RandomSeed = 0x7FFF & Tmp; if ((Tmp & 0x8000) != 0) RandomSeed = RandomSeed | 0x8000; @@ -192,6 +236,10 @@ int subGetRandomNumber() // Mov randomseed, ax // shr ax,1 +#if 0 + printf("::: BugsTerminals.c: ---------- subGetRandomNumber(): %d\n", + subGetRandomNumber); +#endif + return subGetRandomNumber; } // subGetRandomNumber -