X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FBugsTerminals.c;h=330b6f7a356eb65baceb9709d32c5ff891e34bd1;hb=672811c21f07da548a4cdc5e9e14b459bcad1829;hp=f31e6d8c77f753dfe1efa9d155e897bbf623fe91;hpb=8d3d7d213a9691455a49544624bf380e85f43461;p=rocksndiamonds.git diff --git a/src/game_sp/BugsTerminals.c b/src/game_sp/BugsTerminals.c index f31e6d8c..330b6f7a 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 @@ -94,24 +97,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 +150,36 @@ 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 + subCopyAnimToScreen(si, graphic, GfxFrame[lx][ly]); +#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,12 +196,25 @@ int subRandomize() long Tick, Tmp; - Tick = GetTickCount(); + Tick = MyGetTickCount(); Tmp = ((Tick ^ (long)(Tick / (1 << 16))) & 0xFFFF); RandomSeed = 0x7FFF & Tmp; if ((Tmp & 0x8000) != 0) RandomSeed = RandomSeed | 0x8000; +#if 0 + { + int i; + + for (i = 0; i < 10; i++) + printf("::: TEST random number: %d\n", subGetRandomNumber()); + } +#endif + +#if 0 + printf("::: BugsTerminals.c: ========== subRandomize()\n"); +#endif + return subRandomize; } // subRandomize @@ -169,12 +234,18 @@ 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; subGetRandomNumber = Tmp / 2; + // Mov ax, randomseed // Mov bx, &H5E5 // mul bx ' dx:ax = reg * ax @@ -182,6 +253,10 @@ int subGetRandomNumber() // Mov randomseed, ax // shr ax,1 +#if 0 + printf("::: BugsTerminals.c: ---------- subGetRandomNumber(): %d\n", + subGetRandomNumber); +#endif + return subGetRandomNumber; } // subGetRandomNumber -