X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FElectrons.c;h=f678ab58526ced246faf0f3b6f4c0db24a8f6ab2;hb=3d31c6dd1b4f598453c3079d292f47f372f10151;hp=709583cfe6a043c944941d1b3a0ab8c39ee4550d;hpb=5ba7f2d9a3f07f342afdf215a3307d5487cb6d43;p=rocksndiamonds.git diff --git a/src/game_sp/Electrons.c b/src/game_sp/Electrons.c index 709583cf..f678ab58 100644 --- a/src/game_sp/Electrons.c +++ b/src/game_sp/Electrons.c @@ -4,7 +4,8 @@ #include "Electrons.h" -static char *VB_Name = "modElectron"; +// static char *VB_Name = "modElectron"; + // --- Option Explicit // ========================================================================== // SUBROUTINE @@ -101,7 +102,8 @@ int subElectronTurnLeft(int si, int bx) { int subElectronTurnLeft; - int ax, ah, bl, dx, X, Y; + // int ax, ah, bl, dx, X, Y; + int ax, bl, X, Y; ax = (TimerVar & 3); if (ax != 0) @@ -115,7 +117,7 @@ int subElectronTurnLeft(int si, int bx) // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si); Y = GetStretchY(si); - StretchedSprites.BltEx(X, Y, aniElectron[bx]); + StretchedSprites.BltEx(X, Y, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ bx = (bx + 1) & 0x7; MovHighByte(&PlayField16[si], bx); @@ -207,7 +209,8 @@ int subElectronTurnRight(int si, int bx) { int subElectronTurnRight; - int ax, ah, bl, dx, X, Y; + // int ax, ah, bl, dx, X, Y; + int ax, bl, X, Y; ax = (TimerVar & 3); if (ax != 0) @@ -221,7 +224,7 @@ int subElectronTurnRight(int si, int bx) // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si); Y = GetStretchY(si); - StretchedSprites.BltEx(X, Y, aniElectron[0x10 - bx]); + StretchedSprites.BltEx(X, Y, aniFramesElectron[0x10 - bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ bx = ((bx + 1) & 0x7) | 8; MovHighByte(&PlayField16[si], bx); @@ -313,14 +316,15 @@ int subElectronFromBelow(int si, int bx) { int subElectronFromBelow; - int ax, ah, bl, dx, X, Y; + // int ax, ah, bl, dx, X, Y; + int ax, bl, X, Y; bx = bx - 0xF; // get and increment sequence# // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si); Y = GetStretchY(si + FieldWidth); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X, Y - bx * TwoPixels, aniElectron[bx]); + StretchedSprites.BltEx(X, Y - bx * TwoPixels, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ bl = LowByte(bx); if (bl == 7 && LowByte(PlayField16[si + FieldWidth]) != fiExplosion) @@ -375,14 +379,15 @@ int subElectronFromRight(int si, int bx) { int subElectronFromRight; - int ax, ah, bl, dx, X, Y; + // int ax, ah, bl, dx, X, Y; + int ax, bl, X, Y; bx = bx - 0x17; // get and increment sequence# // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si + 1); Y = GetStretchY(si); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X - bx * TwoPixels, Y, aniElectron[bx]); + StretchedSprites.BltEx(X - bx * TwoPixels, Y, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ bl = LowByte(bx); if (bl == 7 && LowByte(PlayField16[si + 1]) != fiExplosion) @@ -436,14 +441,15 @@ int subElectronFromAbove(int si, int bx) { int subElectronFromAbove; - int ax, ah, bl, dx, X, Y; + // int ax, ah, bl, dx, X, Y; + int ax, bl, X, Y; bx = bx - 0x1F; // get and increment sequence# // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si); Y = GetStretchY(si - FieldWidth); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X, Y + bx * TwoPixels, aniElectron[bx]); + StretchedSprites.BltEx(X, Y + bx * TwoPixels, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ bl = LowByte(bx); if (bl == 7 && LowByte(PlayField16[si - FieldWidth]) != fiExplosion) @@ -497,14 +503,15 @@ int subElectronFromLeft(int si, int bx) { int subElectronFromLeft; - int ax, ah, bl, dx, X, Y; + // int ax, ah, bl, dx, X, Y; + int ax, bl, X, Y; bx = bx - 0x27; // get and increment sequence# // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si - 1); Y = GetStretchY(si); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X + bx * TwoPixels, Y, aniElectron[bx]); + StretchedSprites.BltEx(X + bx * TwoPixels, Y, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ bl = LowByte(bx); if (bl == 7 && LowByte(PlayField16[si - 1]) != fiExplosion) @@ -563,7 +570,7 @@ int subDrawElectronTurnLeft(int si, int bx) // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si); Y = GetStretchY(si); - StretchedSprites.BltEx(X, Y, aniElectron[bx]); + StretchedSprites.BltEx(X, Y, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ return subDrawElectronTurnLeft; @@ -578,7 +585,7 @@ int subDrawElectronTurnRight(int si, int bx) // +++++++++++++++++++++++++++++++++++++++++++++++++++++ X = GetStretchX(si); Y = GetStretchY(si); - StretchedSprites.BltEx(X, Y, aniElectron[0x10 - bx]); + StretchedSprites.BltEx(X, Y, aniFramesElectron[0x10 - bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ return subDrawElectronTurnRight; @@ -595,7 +602,7 @@ int subDrawElectronFromBelow(int si, int bx) X = GetStretchX(si); Y = GetStretchY(si + FieldWidth); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X, Y - bx * TwoPixels, aniElectron[bx]); + StretchedSprites.BltEx(X, Y - bx * TwoPixels, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ return subDrawElectronFromBelow; @@ -612,7 +619,7 @@ int subDrawElectronFromRight(int si, int bx) X = GetStretchX(si + 1); Y = GetStretchY(si); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X - bx * TwoPixels, Y, aniElectron[bx]); + StretchedSprites.BltEx(X - bx * TwoPixels, Y, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ return subDrawElectronFromRight; @@ -629,7 +636,7 @@ int subDrawElectronFromAbove(int si, int bx) X = GetStretchX(si); Y = GetStretchY(si - FieldWidth); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X, Y + bx * TwoPixels, aniElectron[bx]); + StretchedSprites.BltEx(X, Y + bx * TwoPixels, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ return subDrawElectronFromAbove; @@ -646,7 +653,7 @@ int subDrawElectronFromLeft(int si, int bx) X = GetStretchX(si - 1); Y = GetStretchY(si); StretchedSprites.BltEx(X, Y, 0); - StretchedSprites.BltEx(X + bx * TwoPixels, Y, aniElectron[bx]); + StretchedSprites.BltEx(X + bx * TwoPixels, Y, aniFramesElectron[bx]); // +++++++++++++++++++++++++++++++++++++++++++++++++++++ return subDrawElectronFromLeft;