rnd-20050103-1-src

[rocksndiamonds.git] / src / game_em / synchro_1.c

diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index 695d52f378875387336beb665f990a8df5fb4836..faea7eb5f5b53655b5f8438e2efcaebd77a678a4 100644 (file)
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -8,6 +8,7 @@
 #include "tile.h"
 #include "level.h"
 #include "sample.h"
+#include "display.h"
 
 
 static void player(struct PLAYER *);
@@ -83,8 +84,11 @@ static int test(struct PLAYER *ply)
   register unsigned int x = ply->x;
   register unsigned int y = ply->y;
 
-  if (lev.time == 0)
-    return(1);
+  if (!ply->alive)
+    return 0;
+
+  if (lev.time_initial > 0 && lev.time == 0)
+    return 1;
 
   switch(Cave[y-1][x])
   {
@@ -104,7 +108,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y][x+1])
@@ -125,7 +129,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y+1][x])
@@ -146,7 +150,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y][x-1])
@@ -167,7 +171,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y][x])
@@ -180,10 +184,10 @@ static int test(struct PLAYER *ply)
     case Xdynamite_2:
     case Xdynamite_3:
     case Xdynamite_4:
-      return(0);
+      return 0;
   }
 
-  return(1);
+  return 1;
 }
 
 static void die(struct PLAYER *ply)
@@ -204,6 +208,9 @@ static void die(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y-1][x] = Xboom_bug;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
 
     case Xtank_n:
@@ -215,6 +222,9 @@ static void die(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y-1][x] = Xboom_bomb;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
   }
 
@@ -229,6 +239,9 @@ static void die(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y][x+1] = Xboom_bug;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
 
     case Xtank_n:
@@ -240,6 +253,9 @@ static void die(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y][x+1] = Xboom_bomb;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
   }
 
@@ -254,6 +270,9 @@ static void die(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y+1][x] = Xboom_bug;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
 
     case Xtank_n:
@@ -265,6 +284,9 @@ static void die(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y+1][x] = Xboom_bomb;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
   }
 
@@ -279,6 +301,9 @@ static void die(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y][x-1] = Xboom_bug;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
 
     case Xtank_n:
@@ -290,6 +315,9 @@ static void die(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y][x-1] = Xboom_bomb;
+#if 0
+      play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
       break;
   }
 
@@ -298,11 +326,11 @@ static void die(struct PLAYER *ply)
     case Xexit_1:
     case Xexit_2:
     case Xexit_3:
-      play[SAMPLE_exit] = 1;
+      play_element_sound(x, y, SAMPLE_exit, Xexit_1);
       break;
 
     default:
-      play[SAMPLE_die] = 1;
+      play_element_sound(x, y, SAMPLE_die, Zplayer);
       break;
   }
 
@@ -389,7 +417,7 @@ static void player(struct PLAYER *ply)
       if (++ply->dynamite_cnt == 5 && ply->dynamite)
       {
        Cave[y][x] = Xdynamite_1;
-       play[SAMPLE_dynamite] = 1;
+       play_element_sound(x, y, SAMPLE_dynamite, Xdynamite_1);
        ply->dynamite--;
       }
     }
@@ -409,6 +437,8 @@ static void player(struct PLAYER *ply)
 
   if (ply->joy_fire == 0)
   {
+    int element = Cave[y][x];
+
     switch(Cave[y][x])
     {
       /* fire is released */
@@ -417,7 +447,7 @@ static void player(struct PLAYER *ply)
       case Yacid_splash_wB:
        Cave[y][x] = Zplayer;
        Next[y][x] = Zplayer;
-       play[SAMPLE_blank] = 1;
+       play_element_sound(x, y, SAMPLE_blank, Xblank);
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
@@ -458,7 +488,7 @@ static void player(struct PLAYER *ply)
        Cave[y][x] = (dy ? (dy < 0 ? Ygrass_nB : Ygrass_sB) :
                      (dx > 0 ? Ygrass_eB : Ygrass_wB));
        Next[y][x] = Zplayer;
-       play[SAMPLE_dirt] = 1;
+       play_element_sound(x, y, SAMPLE_dirt, Xgrass);
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
@@ -468,7 +498,7 @@ static void player(struct PLAYER *ply)
        Cave[y][x] = (dy ? (dy < 0 ? Ydirt_nB : Ydirt_sB) :
                      (dx > 0 ? Ydirt_eB : Ydirt_wB));
        Next[y][x] = Zplayer;
-       play[SAMPLE_dirt] = 1;
+       play_element_sound(x, y, SAMPLE_dirt, Xdirt);
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
@@ -478,7 +508,7 @@ static void player(struct PLAYER *ply)
       case Xdiamond_pause:
        Cave[y][x] = Ydiamond_eat;
        Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.diamond_score;
        lev.required = lev.required < 3 ? 0 : lev.required - 3;
        ply->anim = SPR_walk + anim;
@@ -490,7 +520,7 @@ static void player(struct PLAYER *ply)
       case Xemerald_pause:
        Cave[y][x] = Yemerald_eat;
        Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.emerald_score;
        lev.required = lev.required < 1 ? 0 : lev.required - 1;
        ply->anim = SPR_walk + anim;
@@ -501,7 +531,7 @@ static void player(struct PLAYER *ply)
       case Xdynamite:
        Cave[y][x] = Ydynamite_eat;
        Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.dynamite_score;
        ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1;
        ply->anim = SPR_walk + anim;
@@ -511,41 +541,48 @@ static void player(struct PLAYER *ply)
 
       case Xkey_1:
        ply->keys |= 0x01;
+       Cave[y][x] = Ykey_1_eat;
        goto key_walk;
 
       case Xkey_2:
        ply->keys |= 0x02;
+       Cave[y][x] = Ykey_2_eat;
        goto key_walk;
 
       case Xkey_3:
        ply->keys |= 0x04;
+       Cave[y][x] = Ykey_3_eat;
        goto key_walk;
 
       case Xkey_4:
        ply->keys |= 0x08;
+       Cave[y][x] = Ykey_4_eat;
        goto key_walk;
 
       case Xkey_5:
        ply->keys |= 0x10;
+       Cave[y][x] = Ykey_5_eat;
        goto key_walk;
 
       case Xkey_6:
        ply->keys |= 0x20;
+       Cave[y][x] = Ykey_6_eat;
        goto key_walk;
 
       case Xkey_7:
        ply->keys |= 0x40;
+       Cave[y][x] = Ykey_7_eat;
        goto key_walk;
 
       case Xkey_8:
        ply->keys |= 0x80;
+       Cave[y][x] = Ykey_8_eat;
        goto key_walk;
 
       key_walk:
 
-       Cave[y][x] = Yball_eat;
        Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.key_score;
        ply->anim = SPR_walk + anim;
        ply->x = x;
@@ -553,9 +590,9 @@ static void player(struct PLAYER *ply)
        break;
 
       case Xlenses:
-       Cave[y][x] = Yball_eat;
+       Cave[y][x] = Ylenses_eat;
        Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.lenses_score;
        lev.lenses_cnt = lev.lenses_time;
        ply->anim = SPR_walk + anim;
@@ -564,9 +601,9 @@ static void player(struct PLAYER *ply)
        break;
 
       case Xmagnify:
-       Cave[y][x] = Yball_eat;
+       Cave[y][x] = Ymagnify_eat;
        Next[y][x] = Zplayer;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.magnify_score;
        lev.magnify_cnt = lev.magnify_time;
        ply->anim = SPR_walk + anim;
@@ -592,7 +629,7 @@ static void player(struct PLAYER *ply)
              Cave[y-1][x+dx+1] = Yacid_splash_eB;
            if (Cave[y-1][x+dx-1] == Xblank)
              Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           play_sound(x, y, SAMPLE_acid);
            goto stone_walk;
 
           case Xblank:
@@ -605,7 +642,7 @@ static void player(struct PLAYER *ply)
 
            Cave[y][x] = dx > 0 ? Ystone_eB : Ystone_wB;
            Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           play_element_sound(x, y, SAMPLE_roll, Xstone);
            ply->x = x;
        }
 
@@ -630,7 +667,7 @@ static void player(struct PLAYER *ply)
              Cave[y-1][x+dx+1] = Yacid_splash_eB;
            if (Cave[y-1][x+dx-1] == Xblank)
              Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           play_sound(x, y, SAMPLE_acid);
            goto bomb_walk;
 
          case Xblank:
@@ -643,7 +680,7 @@ static void player(struct PLAYER *ply)
 
            Cave[y][x] = dx > 0 ? Ybomb_eB : Ybomb_wB;
            Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           play_element_sound(x, y, SAMPLE_roll, Xbomb);
            ply->x = x;
        }
 
@@ -668,7 +705,7 @@ static void player(struct PLAYER *ply)
              Cave[y-1][x+dx+1] = Yacid_splash_eB;
            if (Cave[y-1][x+dx-1] == Xblank)
              Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           play_sound(x, y, SAMPLE_acid);
            goto nut_walk;
 
           case Xblank:
@@ -681,7 +718,7 @@ static void player(struct PLAYER *ply)
 
            Cave[y][x] = dx > 0 ? Ynut_eB : Ynut_wB;
            Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           play_element_sound(x, y, SAMPLE_roll, Xnut);
            ply->x = x;
        }
 
@@ -700,7 +737,7 @@ static void player(struct PLAYER *ply)
            Cave[y][x+dx] = dx > 0 ? Yspring_kill_e : Yspring_kill_w;
            Next[y][x] = Zplayer;
            Next[y][x+dx] = dx > 0 ? Xspring_e : Xspring_w;
-           play[SAMPLE_slurp] = 1;
+           play_element_sound(x, y, SAMPLE_slurp, Xalien);
            lev.score += lev.slurp_score;
            ply->x = x;
            break;
@@ -717,7 +754,7 @@ static void player(struct PLAYER *ply)
              Cave[y-1][x+dx+1] = Yacid_splash_eB;
            if (Cave[y-1][x+dx-1] == Xblank)
              Cave[y-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           play_sound(x, y, SAMPLE_acid);
            goto spring_walk;
 
           case Xblank:
@@ -729,7 +766,7 @@ static void player(struct PLAYER *ply)
          spring_walk:
            Cave[y][x] = dx > 0 ? Yspring_eB : Yspring_wB;
            Next[y][x] = Zplayer;
-           play[SAMPLE_roll] = 1;
+           play_element_sound(x, y, SAMPLE_roll, Xspring);
            ply->x = x;
        }
 
@@ -765,7 +802,7 @@ static void player(struct PLAYER *ply)
              Cave[y+dy-1][x+dx+1] = Yacid_splash_eB;
            if (Cave[y+dy-1][x+dx-1] == Xblank)
              Cave[y+dy-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           play_sound(x, y, SAMPLE_acid);
            goto balloon_walk;
 
           case Xblank:
@@ -779,7 +816,7 @@ static void player(struct PLAYER *ply)
            Cave[y][x] = (dy ? (dy < 0 ? Yballoon_nB : Yballoon_sB) :
                          (dx > 0 ? Yballoon_eB : Yballoon_wB));
            Next[y][x] = Zplayer;
-           play[SAMPLE_push] = 1;
+           play_element_sound(x, y, SAMPLE_push, Xballoon);
            ply->x = x;
            ply->y = y;
        }
@@ -810,7 +847,7 @@ static void player(struct PLAYER *ply)
              Cave[y+dy-1][x+dx+1] = Yacid_splash_eB;
            if (Cave[y+dy-1][x+dx-1] == Xblank)
              Cave[y+dy-1][x+dx-1] = Yacid_splash_wB;
-           play[SAMPLE_acid] = 1;
+           play_sound(x, y, SAMPLE_acid);
            goto android_walk;
 
           case Xblank:
@@ -825,7 +862,7 @@ static void player(struct PLAYER *ply)
            Cave[y][x] = (dy ? (dy < 0 ? Yandroid_nB : Yandroid_sB) :
                          (dx > 0 ? Yandroid_eB : Yandroid_wB));
            Next[y][x] = Zplayer;
-           play[SAMPLE_push] = 1;
+           play_element_sound(x, y, SAMPLE_push, Xandroid);
            ply->x = x;
            ply->y = y;
        }
@@ -895,14 +932,14 @@ static void player(struct PLAYER *ply)
 
        Cave[y+dy][x+dx] = Zplayer;
        Next[y+dy][x+dx] = Zplayer;
-       play[SAMPLE_door] = 1;
+       play_element_sound(x, y, SAMPLE_door, element);
        ply->anim = SPR_walk + anim;
        ply->x = x + dx;
        ply->y = y + dy;
        break;
 
       case Xwheel:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SAMPLE_press, element);
        lev.wheel_cnt = lev.wheel_time;
        lev.wheel_x = x;
        lev.wheel_y = y;
@@ -929,17 +966,17 @@ static void player(struct PLAYER *ply)
        goto wind_walk;
 
       wind_walk:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SAMPLE_press, element);
        lev.wind_cnt = lev.wind_time;
        break;
 
       case Xwind_stop:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SAMPLE_press, element);
        lev.wind_cnt = 0;
        break;
 
       case Xswitch:
-       play[SAMPLE_press] = 1;
+       play_element_sound(x, y, SAMPLE_press, element);
        lev.ball_cnt = lev.ball_time;
        lev.ball_state = !lev.ball_state;
        break;
@@ -947,7 +984,7 @@ static void player(struct PLAYER *ply)
       case Xplant:
        Cave[y][x] = Yplant;
        Next[y][x] = Xplant;
-       play[SAMPLE_blank] = 1;
+       play_element_sound(x, y, SAMPLE_blank, Xplant);
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
@@ -956,26 +993,37 @@ static void player(struct PLAYER *ply)
       case Xexit_1:
       case Xexit_2:
       case Xexit_3:
-       play[SAMPLE_exit] = 1;
-       if (--lev.home == 0)
+       play_element_sound(x, y, SAMPLE_exit, Xexit_1);
+
+       if (--lev.home == 0 && lev.time_initial > 0)    /* game won */
          lev.score += lev.time * lev.exit_score / 100;
+
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
+
        break;
     }
   }
   else
   {
+    int element = Cave[y][x];
+
     switch(Cave[y][x])
     {
       /* fire is pressed */
 
       case Xgrass:
+       Cave[y][x] = Ygrass_eat;
+       Next[y][x] = Xblank;
+       play_element_sound(x, y, SAMPLE_dirt, element);
+       ply->anim = SPR_spray + anim;
+       break;
+
       case Xdirt:
-       Cave[y][x] = Yball_eat;
+       Cave[y][x] = Ydirt_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_dirt] = 1;
+       play_element_sound(x, y, SAMPLE_dirt, element);
        ply->anim = SPR_spray + anim;
        break;
 
@@ -983,7 +1031,7 @@ static void player(struct PLAYER *ply)
       case Xdiamond_pause:
        Cave[y][x] = Ydiamond_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.diamond_score;
        lev.required = lev.required < 3 ? 0 : lev.required - 3;
        ply->anim = SPR_walk + anim;
@@ -993,7 +1041,7 @@ static void player(struct PLAYER *ply)
       case Xemerald_pause:
        Cave[y][x] = Yemerald_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.emerald_score;
        lev.required = lev.required < 1 ? 0 : lev.required - 1;
        ply->anim = SPR_walk + anim;
@@ -1002,7 +1050,7 @@ static void player(struct PLAYER *ply)
       case Xdynamite:
        Cave[y][x] = Ydynamite_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.dynamite_score;
        ply->dynamite = ply->dynamite > 9998 ? 9999 : ply->dynamite + 1;
        ply->anim = SPR_walk + anim;
@@ -1010,57 +1058,64 @@ static void player(struct PLAYER *ply)
 
       case Xkey_1:
        ply->keys |= 0x01;
+       Cave[y][x] = Ykey_1_eat;
        goto key_shoot;
 
       case Xkey_2:
        ply->keys |= 0x02;
+       Cave[y][x] = Ykey_2_eat;
        goto key_shoot;
 
       case Xkey_3:
        ply->keys |= 0x04;
+       Cave[y][x] = Ykey_3_eat;
        goto key_shoot;
 
       case Xkey_4:
        ply->keys |= 0x08;
+       Cave[y][x] = Ykey_4_eat;
        goto key_shoot;
 
       case Xkey_5:
        ply->keys |= 0x10;
+       Cave[y][x] = Ykey_5_eat;
        goto key_shoot;
 
       case Xkey_6:
        ply->keys |= 0x20;
+       Cave[y][x] = Ykey_6_eat;
        goto key_shoot;
 
       case Xkey_7:
        ply->keys |= 0x40;
+       Cave[y][x] = Ykey_7_eat;
        goto key_shoot;
 
       case Xkey_8:
        ply->keys |= 0x80;
+       Cave[y][x] = Ykey_8_eat;
        goto key_shoot;
 
       key_shoot:
-       Cave[y][x] = Yball_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.key_score;
        ply->anim = SPR_walk + anim;
        break;
 
       case Xlenses:
-       Cave[y][x] = Yball_eat;
+       Cave[y][x] = Ylenses_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.lenses_score;
        lev.lenses_cnt = lev.lenses_time;
        ply->anim = SPR_walk + anim;
        break;
 
       case Xmagnify:
-       Cave[y][x] = Yball_eat;
+       Cave[y][x] = Ymagnify_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_collect] = 1;
+       play_element_sound(x, y, SAMPLE_collect, element);
        lev.score += lev.magnify_score;
        lev.magnify_cnt = lev.magnify_time;
        ply->anim = SPR_walk + anim;