X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_3.c;h=cdea7a2149d113dde8bc3545a8b573ce4007f0c2;hb=afeec80878187293b10f7dcdd6ff3c094cc97e5d;hp=449ecab094649ad72c2104835294bd8cb11f4b32;hpb=ceb7ded99fc9cc9519adeea07808a344678c196e;p=rocksndiamonds.git diff --git a/src/game_em/synchro_3.c b/src/game_em/synchro_3.c index 449ecab0..cdea7a21 100644 --- a/src/game_em/synchro_3.c +++ b/src/game_em/synchro_3.c @@ -5,35 +5,21 @@ * this should be spread over the frames for reduced cpu load. */ -#include "tile.h" -#include "level.h" -#include "sample.h" +#include "main_em.h" void synchro_3(void) { - register unsigned int x; - register unsigned int y; - register unsigned int count; - register unsigned long random; + int x; + int y; + int count; + unsigned int random; /* update variables */ if (lev.score > 9999) lev.score = 9999; -#if 0 -#if 1 - if (lev.time_initial == 0) - lev.time++; - else if (lev.time > 0) - lev.time--; -#else - if (lev.time) - lev.time--; -#endif -#endif - if (lev.android_move_cnt-- == 0) lev.android_move_cnt = lev.android_move_time; if (lev.android_clone_cnt-- == 0) @@ -52,14 +38,8 @@ void synchro_3(void) if (lev.wonderwall_time && lev.wonderwall_state) lev.wonderwall_time--; -#if 0 - if (lev.time_initial > 0 && - lev.time > 0 && lev.time <= 50 && lev.time % 5 == 0 && setup.time_limit) - play_sound(-1, -1, SAMPLE_time); -#endif - if (lev.wheel_cnt) - play_element_sound(lev.wheel_x, lev.wheel_y, SAMPLE_wheel, Xwheel); + play_element_sound(lev.wheel_x, lev.wheel_y, SOUND_wheel, Xwheel); /* grow amoeba */ @@ -72,8 +52,8 @@ void synchro_3(void) switch (Cave[y][x]) { case Xblank: - case Yacid_splash_eB: - case Yacid_splash_wB: + case Xacid_splash_e: + case Xacid_splash_w: case Xgrass: case Xdirt: case Xsand: @@ -83,7 +63,7 @@ void synchro_3(void) tab_amoeba[Cave[y][x+1]] || tab_amoeba[Cave[y+1][x]] || tab_amoeba[Cave[y][x-1]]) - Cave[y][x] = Xdrip_eat; + Cave[y][x] = Xdrip; } random = random * 129 + 1;