X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_3.c;h=cdea7a2149d113dde8bc3545a8b573ce4007f0c2;hb=afeec80878187293b10f7dcdd6ff3c094cc97e5d;hp=570d4da81a16be2b3fc89343a97067df8f75a606;hpb=51dcb2097c619c5f9ba924a7edb4a3bdd6a6986e;p=rocksndiamonds.git

diff --git a/src/game_em/synchro_3.c b/src/game_em/synchro_3.c
index 570d4da8..cdea7a21 100644
--- a/src/game_em/synchro_3.c
+++ b/src/game_em/synchro_3.c
@@ -5,33 +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 1
-  if (lev.time_initial == 0)
-    lev.time++;
-  else if (lev.time)
-    lev.time--;
-#else
-  if (lev.time)
-    lev.time--;
-#endif
-
   if (lev.android_move_cnt-- == 0)
     lev.android_move_cnt = lev.android_move_time;
   if (lev.android_clone_cnt-- == 0)
@@ -50,16 +38,12 @@ void synchro_3(void)
   if (lev.wonderwall_time && lev.wonderwall_state)
     lev.wonderwall_time--;
 
-  if (lev.time_initial > 0 &&
-      lev.time > 0 && lev.time <= 50 && lev.time % 5 == 0)
-    play_sound(-1, -1, SAMPLE_time);
-
   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 */
 
-  random = Random;
+  random = RandomEM;
 
   for (count = lev.amoeba_time; count--;)
   {
@@ -68,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:
@@ -79,13 +63,13 @@ 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;
   }
 
-  Random = random;
+  RandomEM = random;
 
   /* handle explosions */