projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed constant
[rocksndiamonds.git]
/
src
/
game_em
/
logic.c
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index bbac90d27f74286990811db67b35b7244c83fe1e..cd2028c9e97e56ccd905c4e5fc249379609be22d 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-20,7
+20,7
@@
static short **cave, **next, **boom;
static unsigned int seed;
static int score;
static unsigned int seed;
static int score;
-static const byte is_blank[TILE_MAX] =
+static const byte is_blank[
GAME_
TILE_MAX] =
{
[Xblank] = 1,
[Xsplash_e] = 1,
{
[Xblank] = 1,
[Xsplash_e] = 1,
@@
-35,7
+35,7
@@
static const byte is_blank[TILE_MAX] =
[Xfake_acid_8] = 1
};
[Xfake_acid_8] = 1
};
-static const byte is_blank_or_acid[TILE_MAX] =
+static const byte is_blank_or_acid[
GAME_
TILE_MAX] =
{
[Xblank] = 1,
[Xsplash_e] = 1,
{
[Xblank] = 1,
[Xsplash_e] = 1,
@@
-58,7
+58,7
@@
static const byte is_blank_or_acid[TILE_MAX] =
[Xacid_8] = 1
};
[Xacid_8] = 1
};
-static const byte is_fake_acid[TILE_MAX] =
+static const byte is_fake_acid[
GAME_
TILE_MAX] =
{
[Xfake_acid_1] = 1,
[Xfake_acid_2] = 1,
{
[Xfake_acid_1] = 1,
[Xfake_acid_2] = 1,
@@
-70,7
+70,7
@@
static const byte is_fake_acid[TILE_MAX] =
[Xfake_acid_8] = 1
};
[Xfake_acid_8] = 1
};
-static const byte is_amoeba[TILE_MAX] =
+static const byte is_amoeba[
GAME_
TILE_MAX] =
{
[Xfake_amoeba] = 1,
[Yfake_amoeba] = 1,
{
[Xfake_amoeba] = 1,
[Yfake_amoeba] = 1,
@@
-84,7
+84,7
@@
static const byte is_amoeba[TILE_MAX] =
[Xamoeba_8] = 1
};
[Xamoeba_8] = 1
};
-static const byte is_android_walkable[TILE_MAX] =
+static const byte is_android_walkable[
GAME_
TILE_MAX] =
{
[Xblank] = 1,
[Xsplash_e] = 1,
{
[Xblank] = 1,
[Xsplash_e] = 1,
@@
-7290,6
+7290,9
@@
static void logic_players(void)
for (i = 0; i < MAX_PLAYERS; i++)
{
for (i = 0; i < MAX_PLAYERS; i++)
{
+ if (!ply[i].alive)
+ continue;
+
/* check for wrap-around movement */
if (ply[i].x < lev.left ||
ply[i].x > lev.right - 1)
/* check for wrap-around movement */
if (ply[i].x < lev.left ||
ply[i].x > lev.right - 1)
@@
-7435,13
+7438,13
@@
static void logic_globals(void)
void logic(void)
{
void logic(void)
{
- if (frame ==
7
)
+ if (frame ==
0
)
{
logic_players();
logic_objects();
}
{
logic_players();
logic_objects();
}
- if (frame ==
6
)
+ if (frame ==
1
)
{
logic_globals();
}
{
logic_globals();
}