X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FInfotrons.c;h=c804191fd8e3c4e89165339744fbd9851eebd630;hb=d45b35552f4ca1ada1266fb7e8b6968d878019a6;hp=aae2d00e24857695cd757f6ccad18c140d5a1993;hpb=18863a5655e9e07d548e2d673e7f82336703c8fb;p=rocksndiamonds.git diff --git a/src/game_sp/Infotrons.c b/src/game_sp/Infotrons.c index aae2d00e..c804191f 100644 --- 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 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" +#endif 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 - Mov(&PlayField16[si - 1], 0x8888); + PlayField16[si - 1] = 0x8888; + 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 - Mov(&PlayField16[si + 1], 0x8888); + PlayField16[si + 1] = 0x8888; + return subAnimateInfotrons; loc_g_1364: // Murphy dies, but not in any case