projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated contact info in source file headers
[rocksndiamonds.git]
/
src
/
game_sp
/
Explosions.c
diff --git
a/src/game_sp/Explosions.c
b/src/game_sp/Explosions.c
index ccd75b8f48b99180c1853455f2d8e1382cbe2246..0a73d7541a01ad675e4fdb1c0a95374768a9c207 100644
(file)
--- a/
src/game_sp/Explosions.c
+++ b/
src/game_sp/Explosions.c
@@
-17,7
+17,10
@@
static void subExplodeZonk(int tsi, int cx);
void subAnimateExplosion(int si)
{
void subAnimateExplosion(int si)
{
- int ax, bl, X, Y;
+ int ax, bl;
+#if 0
+ int X, Y;
+#endif
if (LowByte(PlayField16[si]) != fiExplosion)
return;
if (LowByte(PlayField16[si]) != fiExplosion)
return;
@@
-35,15
+38,18
@@
void subAnimateExplosion(int si)
MovHighByte(&PlayField16[si], bl);
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
MovHighByte(&PlayField16[si], bl);
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#if 0
X = GetStretchX(si);
Y = GetStretchY(si);
X = GetStretchX(si);
Y = GetStretchY(si);
+#endif
GfxGraphic[GetX(si)][GetY(si)] = aniDefaultExplosion;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
if (bl == 8)
{
PlayField16[si] = 0;
GfxGraphic[GetX(si)][GetY(si)] = aniDefaultExplosion;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
if (bl == 8)
{
PlayField16[si] = 0;
- ExplosionShake = 0; // nothing explodes
+ ExplosionShake = 0; // nothing explodes
+ // ExplosionShakeMurphy = 0; // nothing explodes
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
GfxGraphic[GetX(si)][GetY(si)] = aniSpace;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
GfxGraphic[GetX(si)][GetY(si)] = aniSpace;
@@
-57,7
+63,8
@@
loc_g_28D0: // explosion produces infotron
if (bl == 0x89)
{
PlayField16[si] = fiInfotron;
if (bl == 0x89)
{
PlayField16[si] = fiInfotron;
- MovLowByte(&ExplosionShake, 0); // nothing explodes
+ MovLowByte(&ExplosionShake, 0); // nothing explodes
+ // MovLowByte(&ExplosionShakeMurphy, 0); // nothing explodes
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
GfxGraphic[GetX(si)][GetY(si)] = aniInfotron;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
GfxGraphic[GetX(si)][GetY(si)] = aniInfotron;
@@
-69,8
+76,10
@@
loc_g_28D0: // explosion produces infotron
MovHighByte(&PlayField16[si], bl);
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
MovHighByte(&PlayField16[si], bl);
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#if 0
X = GetStretchX(si);
Y = GetStretchY(si);
X = GetStretchX(si);
Y = GetStretchY(si);
+#endif
GfxGraphic[GetX(si)][GetY(si)] = aniElectronExplosion;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
}
GfxGraphic[GetX(si)][GetY(si)] = aniElectronExplosion;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
}
@@
-88,14
+97,19
@@
void ExplodeFieldSP(int si)
if (ax == fiHardWare)
return;
if (ax == fiHardWare)
return;
- ExplosionShake = 1; // something explodes
+ ExplosionShake = 1; // something explodes
+
if (ax == fiMurphy)
{
if (ax == fiMurphy)
{
-#if
1
+#if
0
printf("::: Explosions.c: ExplodeFieldSP(): killing murphy\n");
#endif
KillMurphyFlag = 1;
printf("::: Explosions.c: ExplodeFieldSP(): killing murphy\n");
#endif
KillMurphyFlag = 1;
+
+#if 1
+ ExplosionShakeMurphy = 30; // Murphy explodes
+#endif
}
if (ax == fiElectron)
}
if (ax == fiElectron)
@@
-129,7
+143,7
@@
static void LetExplodeFieldSP(int tsi, int cx, int dh)
{
int al;
{
int al;
- if (tsi <
(-FieldWidth)
)
+ if (tsi <
-FieldWidth
)
return;
al = LowByte(PlayField16[tsi]);
return;
al = LowByte(PlayField16[tsi]);
@@
-161,7
+175,7
@@
static void LetExplodeFieldSP(int tsi, int cx, int dh)
break;
case fiMurphy:
break;
case fiMurphy:
-#if
1
+#if
0
printf("::: Explosions.c: LetExplodeFieldSP(): killing murphy [%d]\n",
tsi);
#endif
printf("::: Explosions.c: LetExplodeFieldSP(): killing murphy [%d]\n",
tsi);
#endif
@@
-269,15
+283,19
@@
static void subExplodeInfotron(int tsi, int cx)
void subClearFieldDueToExplosion(int si)
{
void subClearFieldDueToExplosion(int si)
{
+#if 0
int X, Y;
int X, Y;
+#endif
if (LowByte(PlayField16[si]) == fiExplosion)
return;
PlayField16[si] = 0;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
if (LowByte(PlayField16[si]) == fiExplosion)
return;
PlayField16[si] = 0;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#if 0
X = GetStretchX(si);
Y = GetStretchY(si);
X = GetStretchX(si);
Y = GetStretchY(si);
+#endif
GfxGraphic[GetX(si)][GetY(si)] = aniSpace;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
}
GfxGraphic[GetX(si)][GetY(si)] = aniSpace;
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
}