#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 *);
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])
{
case Xtank_goe:
case Xtank_gos:
case Xtank_gow:
- return(1);
+ return 1;
}
switch(Cave[y][x+1])
case Xtank_goe:
case Xtank_gos:
case Xtank_gow:
- return(1);
+ return 1;
}
switch(Cave[y+1][x])
case Xtank_goe:
case Xtank_gos:
case Xtank_gow:
- return(1);
+ return 1;
}
switch(Cave[y][x-1])
case Xtank_goe:
case Xtank_gos:
case Xtank_gow:
- return(1);
+ return 1;
}
switch(Cave[y][x])
case Xdynamite_2:
case Xdynamite_3:
case Xdynamite_4:
- return(0);
+ return 0;
}
- return(1);
+ return 1;
}
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:
case Xtank_gos:
case Xtank_gow:
Cave[y-1][x] = Xboom_bomb;
+#if 0
+ play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
break;
}
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:
case Xtank_gos:
case Xtank_gow:
Cave[y][x+1] = Xboom_bomb;
+#if 0
+ play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
break;
}
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:
case Xtank_gos:
case Xtank_gow:
Cave[y+1][x] = Xboom_bomb;
+#if 0
+ play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
break;
}
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:
case Xtank_gos:
case Xtank_gow:
Cave[y][x-1] = Xboom_bomb;
+#if 0
+ play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
break;
}
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;
}
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--;
}
}
if (ply->joy_fire == 0)
{
+ int element = Cave[y][x];
+
switch(Cave[y][x])
{
/* fire is released */
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;
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;
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;
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;
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;
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;
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;
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;
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;
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:
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;
}
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:
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;
}
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:
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;
}
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;
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:
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;
}
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:
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;
}
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:
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;
}
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;
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;
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;
case Xexit_1:
case Xexit_2:
case Xexit_3:
- play[SAMPLE_exit] = 1;
- if (--lev.home == 0)
- lev.score += lev.time * lev.exit_score / 100;
+ play_element_sound(x, y, SAMPLE_exit, Xexit_1);
+ if (--lev.home == 0 && lev.time_initial > 0)
+ lev.score += lev.time * lev.exit_score / 100;
ply->anim = SPR_walk + anim;
ply->x = x;
ply->y = y;
}
else
{
+ int element = Cave[y][x];
+
switch(Cave[y][x])
{
/* fire is pressed */
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;
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;
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;
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;
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;
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;
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;
}
}
}
-
-#endif