projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100315-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
Infotrons.c
diff --git
a/src/game_sp/Infotrons.c
b/src/game_sp/Infotrons.c
index aae2d00e24857695cd757f6ccad18c140d5a1993..c804191fd8e3c4e89165339744fbd9851eebd630 100644
(file)
--- a/
src/game_sp/Infotrons.c
+++ b/
src/game_sp/Infotrons.c
@@
-173,7
+173,19
@@
loc_g_1242: // infotron comes falling from above
if (ax == fiOrangeDisk) // orange disk hit
goto loc_g_1386;
if (ax == fiOrangeDisk) // orange disk hit
goto loc_g_1386;
+#if 1
+
+#if 1
+ // play the infotron sound, 'cause infotron hits something "hard"
+ subSoundFX(si, fiInfotron, actImpact);
+#else
+ // play the zonk sound, 'cause zonk hits something "hard"
+ subSoundFX(si, fiZonk, actImpact);
+#endif
+
+#else
subSoundFXZonk(); // play the zonk sound,'cause zonk hits something "hard"
subSoundFXZonk(); // play the zonk sound,'cause zonk hits something "hard"
+#endif
if (! (ax == fiZonk || ax == fiInfotron || ax == fiRAM))
return subAnimateInfotrons;
if (! (ax == fiZonk || ax == fiInfotron || ax == fiRAM))
return subAnimateInfotrons;
@@
-201,7
+213,8
@@
loc_g_133A: // test if infotron may roll left
goto loc_g_11BD;
MovHighByte(&PlayField16[si], 0x50); // infotron rolls left
goto loc_g_11BD;
MovHighByte(&PlayField16[si], 0x50); // infotron rolls left
- Mov(&PlayField16[si - 1], 0x8888);
+ PlayField16[si - 1] = 0x8888;
+
return subAnimateInfotrons;
loc_g_1350: // test if infotron may roll right
return subAnimateInfotrons;
loc_g_1350: // test if infotron may roll right
@@
-209,7
+222,8
@@
loc_g_1350: // test if infotron may roll right
return subAnimateInfotrons;
MovHighByte(&PlayField16[si], 0x60); // infotron rolls right
return subAnimateInfotrons;
MovHighByte(&PlayField16[si], 0x60); // infotron rolls right
- Mov(&PlayField16[si + 1], 0x8888);
+ PlayField16[si + 1] = 0x8888;
+
return subAnimateInfotrons;
loc_g_1364: // Murphy dies, but not in any case
return subAnimateInfotrons;
loc_g_1364: // Murphy dies, but not in any case