projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20130916-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 5f0929875b67b59ca711d4c89839cfd2da4eec6d..ef4d0f2c82e73d1e88e7fa7ba87dc22557b90163 100644
(file)
--- a/
src/game_em/synchro_1.c
+++ b/
src/game_em/synchro_1.c
@@
-296,7
+296,9
@@
static void kill_player(struct PLAYER *ply)
case Xbug_gow:
Cave[y-1][x] = Xboom_bug;
#if 0
case Xbug_gow:
Cave[y-1][x] = Xboom_bug;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
#endif
break;
@@
-310,7
+312,9
@@
static void kill_player(struct PLAYER *ply)
case Xtank_gow:
Cave[y-1][x] = Xboom_bomb;
#if 0
case Xtank_gow:
Cave[y-1][x] = Xboom_bomb;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
}
#endif
break;
}
@@
-327,7
+331,9
@@
static void kill_player(struct PLAYER *ply)
case Xbug_gow:
Cave[y][x+1] = Xboom_bug;
#if 0
case Xbug_gow:
Cave[y][x+1] = Xboom_bug;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
#endif
break;
@@
-341,7
+347,9
@@
static void kill_player(struct PLAYER *ply)
case Xtank_gow:
Cave[y][x+1] = Xboom_bomb;
#if 0
case Xtank_gow:
Cave[y][x+1] = Xboom_bomb;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
}
#endif
break;
}
@@
-358,7
+366,9
@@
static void kill_player(struct PLAYER *ply)
case Xbug_gow:
Cave[y+1][x] = Xboom_bug;
#if 0
case Xbug_gow:
Cave[y+1][x] = Xboom_bug;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
#endif
break;
@@
-372,7
+382,9
@@
static void kill_player(struct PLAYER *ply)
case Xtank_gow:
Cave[y+1][x] = Xboom_bomb;
#if 0
case Xtank_gow:
Cave[y+1][x] = Xboom_bomb;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
}
#endif
break;
}
@@
-389,7
+401,9
@@
static void kill_player(struct PLAYER *ply)
case Xbug_gow:
Cave[y][x-1] = Xboom_bug;
#if 0
case Xbug_gow:
Cave[y][x-1] = Xboom_bug;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
#endif
break;
@@
-403,7
+417,9
@@
static void kill_player(struct PLAYER *ply)
case Xtank_gow:
Cave[y][x-1] = Xboom_bomb;
#if 0
case Xtank_gow:
Cave[y][x-1] = Xboom_bomb;
#if 0
+#if PLAY_ELEMENT_SOUND
play_element_sound(x, y, SAMPLE_boom, Zplayer);
play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
#endif
break;
}
#endif
break;
}
@@
-413,10
+429,15
@@
static void kill_player(struct PLAYER *ply)
case Xexit_1:
case Xexit_2:
case Xexit_3:
case Xexit_1:
case Xexit_2:
case Xexit_3:
+ lev.exit_x = x;
+ lev.exit_y = y;
play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
break;
default:
play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
break;
default:
+#if PLAY_ELEMENT_SOUND
+ play_element_sound(x, y, SAMPLE_boom, Zplayer);
+#endif
play_element_sound(x, y, SAMPLE_die, Zplayer);
break;
}
play_element_sound(x, y, SAMPLE_die, Zplayer);
break;
}
@@
-448,7
+469,6
@@
static void check_player(struct PLAYER *ply)
int oldy = ply->y;
int x = oldx;
int y = oldy;
int oldy = ply->y;
int x = oldx;
int y = oldy;
- int anim = 0;
int dx = 0, dy = 0;
game_em.last_player_direction[ply->num] = MV_NONE;
int dx = 0, dy = 0;
game_em.last_player_direction[ply->num] = MV_NONE;
@@
-464,26
+484,22
@@
static void check_player(struct PLAYER *ply)
{
x--;
dx = -1;
{
x--;
dx = -1;
- anim = 3;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
- anim = 1;
}
if (ply->joy_n) /* north */
{
y--;
dy = -1;
}
if (ply->joy_n) /* north */
{
y--;
dy = -1;
- anim = 0;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
- anim = 2;
}
#else
}
#else
@@
-494,25
+510,21
@@
static void check_player(struct PLAYER *ply)
{
y--;
dy = -1;
{
y--;
dy = -1;
- anim = 0;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
- anim = 1;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
- anim = 2;
}
else if (ply->joy_w) /* west */
{
x--;
dx = -1;
}
else if (ply->joy_w) /* west */
{
x--;
dx = -1;
- anim = 3;
}
}
else
}
}
else
@@
-521,25
+533,21
@@
static void check_player(struct PLAYER *ply)
{
x--;
dx = -1;
{
x--;
dx = -1;
- anim = 3;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
- anim = 2;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
- anim = 1;
}
else if (ply->joy_n) /* north */
{
y--;
dy = -1;
}
else if (ply->joy_n) /* north */
{
y--;
dy = -1;
- anim = 0;
}
}
#endif
}
}
#endif
@@
-1245,7
+1253,10
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
case Xexit_1:
case Xexit_2:
case Xexit_3:
case Xexit_1:
case Xexit_2:
case Xexit_3:
+#if 0
+ /* !!! already played in kill_player !!! */
play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
+#endif
lev.home--;
lev.home--;