X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=849e685cef5cc7df62d96a63a42ed6948f50258b;hp=f42d8da94168d1a3482023feed86a270a5ad3d48;hb=18863a5655e9e07d548e2d673e7f82336703c8fb;hpb=f926e522aef77158e0011ae5ad2cf8805509d6d1 diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c index f42d8da9..849e685c 100644 --- a/src/game_sp/Murphy.c +++ b/src/game_sp/Murphy.c @@ -1691,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); @@ -1729,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) @@ -1764,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: @@ -2668,6 +2683,8 @@ int subSpPortTest(int si) return subSpPortTest; } // subSpPortTest +#if 0 + void subCopyFieldToScreen(int si, int fi) { int X, Y; @@ -2679,6 +2696,8 @@ void subCopyFieldToScreen(int si, int fi) // +++++++++++++++++++++++++++++++++++++++++ } +#endif + void subCopyAnimToScreen(int si, int graphic, int sync_frame) { int X, Y;