#include "main_em.h"
-#if 0
-extern int centered_player_nr;
-#endif
-
-extern boolean checkIfAllPlayersFitToScreen();
+#define USE_CHANGED_ACID_STUFF 1
static void check_player(struct PLAYER *);
static void kill_player(struct PLAYER *);
void synchro_1(void)
{
-#if 1
-
int start_check_nr;
int i;
game_em.any_player_moving = FALSE;
+ game_em.any_player_snapping = FALSE;
/* must test for death and actually kill separately */
-
for (i = 0; i < MAX_PLAYERS; i++)
{
boolean ply_kill = player_killed(&ply[i]);
kill_player(&ply[i]);
}
-#else
-
- /* must test for death and actually kill separately */
- boolean ply1_kill = player_killed(&ply1);
- boolean ply2_kill = player_killed(&ply2);
-
- if (ply1.alive && ply1_kill)
- kill_player(&ply1);
- if (ply2.alive && ply2_kill)
- kill_player(&ply2);
-
-#endif
-
-#if 0
- ply1.alive = 1; /* debugging */
-#endif
-
-#if 1
-
for (i = 0; i < MAX_PLAYERS; i++)
{
ply[i].oldx = ply[i].x;
Next[ply[i].y][ply[i].x] = Zplayer;
}
}
-
-#else
-
- ply1.oldx = ply1.x;
- ply1.oldy = ply1.y;
- ply1.anim = SPR_still;
- ply2.oldx = ply2.x;
- ply2.oldy = ply2.y;
- ply2.anim = SPR_still;
-
- if (RandomEM & 256)
- {
- if (ply1.alive) check_player(&ply1);
- if (ply2.alive) check_player(&ply2);
- }
- else
- {
- if (ply2.alive) check_player(&ply2);
- if (ply1.alive) check_player(&ply1);
- }
-
- if (ply1.alive)
- {
- if (Cave[ply1.oldy][ply1.oldx] == Zplayer)
- {
- Cave[ply1.oldy][ply1.oldx] = Xblank;
- Next[ply1.oldy][ply1.oldx] = Xblank;
- }
-
- if (Cave[ply1.y][ply1.x] == Xblank)
- {
- Cave[ply1.y][ply1.x] = Zplayer;
- Next[ply1.y][ply1.x] = Zplayer;
- }
- }
-
- if (ply2.alive)
- {
- if (Cave[ply2.oldy][ply2.oldx] == Zplayer)
- {
- Cave[ply2.oldy][ply2.oldx] = Xblank;
- Next[ply2.oldy][ply2.oldx] = Xblank;
- }
-
- if (Cave[ply2.y][ply2.x] == Xblank)
- {
- Cave[ply2.y][ply2.x] = Zplayer;
- Next[ply2.y][ply2.x] = Zplayer;
- }
- }
-
-#endif
}
static boolean player_killed(struct PLAYER *ply)
int x = ply->x;
int y = ply->y;
-#if 0
- printf("::: %d: %d, %d\n", ply->num, x, y);
-#endif
-
if (!ply->alive)
return FALSE;
-#if 1
if (lev.killed_out_of_time && setup.time_limit)
return TRUE;
-#else
- if (lev.time_initial > 0 && lev.time == 0 && setup.time_limit)
- return TRUE;
-#endif
switch(Cave[y-1][x])
{
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:
+ lev.exit_x = x;
+ lev.exit_y = y;
play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
break;
switch(Cave[y][x])
{
-#if 1
+#if USE_CHANGED_ACID_STUFF
case Xacid_1:
case Xacid_2:
case Xacid_3:
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;
-#if 0
- printf("::: up == %d, down == %d, left == %d, right == %d, fire == %d [spin == %d, stick == %d]\n",
- ply->joy_n, ply->joy_s, ply->joy_w, ply->joy_e, ply->joy_fire,
- ply->joy_spin, ply->joy_stick);
-#endif
-
-#if 1
if (ply->joy_w) /* west */
{
x--;
dx = -1;
- anim = 3;
}
else if (ply->joy_e) /* east */
{
x++;
dx = 1;
- anim = 1;
}
if (ply->joy_n) /* north */
{
y--;
dy = -1;
- anim = 0;
}
else if (ply->joy_s) /* south */
{
y++;
dy = 1;
- anim = 2;
}
-#else
-
- if ((ply->joy_spin = !ply->joy_spin))
- {
- if (ply->joy_n) /* north */
- {
- y--;
- dy = -1;
- anim = 0;
- }
- else if (ply->joy_e) /* east */
- {
- x++;
- dx = 1;
- anim = 1;
- }
- else if (ply->joy_s) /* south */
- {
- y++;
- dy = 1;
- anim = 2;
- }
- else if (ply->joy_w) /* west */
- {
- x--;
- dx = -1;
- anim = 3;
- }
- }
- else
- {
- if (ply->joy_w) /* west */
- {
- x--;
- dx = -1;
- anim = 3;
- }
- else if (ply->joy_s) /* south */
- {
- y++;
- dy = 1;
- anim = 2;
- }
- else if (ply->joy_e) /* east */
- {
- x++;
- dx = 1;
- anim = 1;
- }
- else if (ply->joy_n) /* north */
- {
- y--;
- dy = -1;
- anim = 0;
- }
- }
-#endif
-
if (dx || dy)
{
int oldx = ply->x;
}
else /* player wants to snap */
{
- player_digfield(ply, dx, dy);
+ game_em.any_player_snapping = player_digfield(ply, dx, dy);
}
}
ply->y = y;
break;
-#if 1
+#if USE_CHANGED_ACID_STUFF
case Xacid_1:
case Xacid_2:
case Xacid_3:
case Xacid_6:
case Xacid_7:
case Xacid_8:
-#endif
if (Cave[y-1][x+1] == Xblank)
Cave[y-1][x+1] = Yacid_splash_eB;
if (Cave[y-1][x-1] == Xblank)
Cave[y-1][x-1] = Yacid_splash_wB;
play_element_sound(x, y, SAMPLE_acid, Xacid_1);
+#endif
case Xboom_android:
case Xboom_1:
case Xtank_goe:
case Xtank_gos:
case Xtank_gow:
-#if 0
+
+#if !USE_CHANGED_ACID_STUFF
case Xacid_1:
case Xacid_2:
case Xacid_3:
play_element_sound(x, y, SAMPLE_collect, element);
lev.score += lev.diamond_score;
lev.required = lev.required < 3 ? 0 : lev.required - 3;
+ game.snapshot.collected_item = TRUE;
ply->anim = SPR_walk + anim;
ply->x = x;
ply->y = y;
play_element_sound(x, y, SAMPLE_collect, element);
lev.score += lev.emerald_score;
lev.required = lev.required < 1 ? 0 : lev.required - 1;
+ game.snapshot.collected_item = TRUE;
ply->anim = SPR_walk + anim;
ply->x = x;
ply->y = y;
case Xexit_1:
case Xexit_2:
case Xexit_3:
- play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
-
lev.home--;
-#if 0
- /* !!! CHECK SCORE CALCULATION !!! */
- if (lev.home == 0 && lev.time_initial > 0) /* game won */
- lev.score += lev.time * lev.exit_score / 100;
-#endif
+ if (lev.home == 0)
+ game_em.level_solved = TRUE;
ply->anim = SPR_walk + anim;
ply->x = x;
play_element_sound(x, y, SAMPLE_collect, element);
lev.score += lev.diamond_score;
lev.required = lev.required < 3 ? 0 : lev.required - 3;
+ game.snapshot.collected_item = TRUE;
ply->anim = SPR_walk + anim;
break;
play_element_sound(x, y, SAMPLE_collect, element);
lev.score += lev.emerald_score;
lev.required = lev.required < 1 ? 0 : lev.required - 1;
+ game.snapshot.collected_item = TRUE;
ply->anim = SPR_walk + anim;
break;
projects / rocksndiamonds.git / blobdiff