rnd-20040927-3-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 3af35743e307e963725230bdc7f5d7a87e8b7874..0ff540e35a87640410ca97d52a0531de0271f5d8 100644 (file)
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -8,10 +8,9 @@
 #include "tile.h"
 #include "level.h"
 #include "sample.h"
+#include "display.h"
 
 
-#if defined(TARGET_X11)
-
 static void player(struct PLAYER *);
 static int test(struct PLAYER *);
 static void die(struct PLAYER *);
@@ -85,6 +84,9 @@ static int test(struct PLAYER *ply)
   register unsigned int x = ply->x;
   register unsigned int y = ply->y;
 
+  if (!ply->alive)
+    return 0;
+
   if (lev.time == 0)
     return(1);
 
@@ -300,11 +302,11 @@ static void die(struct PLAYER *ply)
     case Xexit_1:
     case Xexit_2:
     case Xexit_3:
-      play[SAMPLE_exit] = 1;
+      play_sound(x, y, SAMPLE_exit);
       break;
 
     default:
-      play[SAMPLE_die] = 1;
+      play_sound(x, y, SAMPLE_die);
       break;
   }
 
@@ -391,7 +393,7 @@ static void player(struct PLAYER *ply)
       if (++ply->dynamite_cnt == 5 && ply->dynamite)
       {
        Cave[y][x] = Xdynamite_1;
-       play[SAMPLE_dynamite] = 1;
+       play_sound(x, y, SAMPLE_dynamite);
        ply->dynamite--;
       }
     }
@@ -411,6 +413,8 @@ static void player(struct PLAYER *ply)
 
   if (ply->joy_fire == 0)
   {
+    int element = Cave[y][x];
+
     switch(Cave[y][x])
     {
       /* fire is released */
@@ -419,7 +423,7 @@ static void player(struct PLAYER *ply)
       case Yacid_splash_wB:
        Cave[y][x] = Zplayer;
        Next[y][x] = Zplayer;
-       play[SAMPLE_blank] = 1;
+       play_sound(x, y, SAMPLE_blank);
        ply->anim = SPR_walk + anim;
        ply->x = x;
        ply->y = y;
@@ -460,7 +464,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;
@@ -470,7 +474,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;
@@ -480,7 +484,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;
@@ -492,7 +496,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;
@@ -503,7 +507,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;
@@ -547,7 +551,7 @@ static void player(struct PLAYER *ply)
 
        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;
@@ -557,7 +561,7 @@ static void player(struct PLAYER *ply)
       case Xlenses:
        Cave[y][x] = Yball_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;
@@ -568,7 +572,7 @@ static void player(struct PLAYER *ply)
       case Xmagnify:
        Cave[y][x] = Yball_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;
@@ -594,7 +598,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:
@@ -607,7 +611,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;
        }
 
@@ -632,7 +636,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:
@@ -645,7 +649,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;
        }
 
@@ -670,7 +674,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:
@@ -683,7 +687,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;
        }
 
@@ -702,7 +706,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_sound(x, y, SAMPLE_slurp);
            lev.score += lev.slurp_score;
            ply->x = x;
            break;
@@ -719,7 +723,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:
@@ -731,7 +735,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;
        }
 
@@ -767,7 +771,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:
@@ -781,7 +785,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;
        }
@@ -812,7 +816,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:
@@ -827,7 +831,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;
        }
@@ -897,14 +901,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;
@@ -931,17 +935,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;
@@ -949,7 +953,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;
@@ -958,7 +962,7 @@ static void player(struct PLAYER *ply)
       case Xexit_1:
       case Xexit_2:
       case Xexit_3:
-       play[SAMPLE_exit] = 1;
+       play_sound(x, y, SAMPLE_exit);
        if (--lev.home == 0)
          lev.score += lev.time * lev.exit_score / 100;
        ply->anim = SPR_walk + anim;
@@ -969,6 +973,8 @@ static void player(struct PLAYER *ply)
   }
   else
   {
+    int element = Cave[y][x];
+
     switch(Cave[y][x])
     {
       /* fire is pressed */
@@ -977,7 +983,7 @@ static void player(struct PLAYER *ply)
       case Xdirt:
        Cave[y][x] = Yball_eat;
        Next[y][x] = Xblank;
-       play[SAMPLE_dirt] = 1;
+       play_element_sound(x, y, SAMPLE_dirt, element);
        ply->anim = SPR_spray + anim;
        break;
 
@@ -985,7 +991,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;
@@ -995,7 +1001,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;
@@ -1004,7 +1010,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;
@@ -1045,7 +1051,7 @@ static void player(struct PLAYER *ply)
       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;
@@ -1053,7 +1059,7 @@ static void player(struct PLAYER *ply)
       case Xlenses:
        Cave[y][x] = Yball_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;
@@ -1062,7 +1068,7 @@ static void player(struct PLAYER *ply)
       case Xmagnify:
        Cave[y][x] = Yball_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;
@@ -1070,5 +1076,3 @@ static void player(struct PLAYER *ply)
     }
   }
 }
-
-#endif