projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed some variables and changed some initializations
[rocksndiamonds.git]
/
src
/
game_em
/
logic.c
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index 9e3b690f2a9c6b70127f3645faaeeafc770fc0bc..be2bed34a712bd36d7b2fa0fe9161d5fe979450e 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,
@@
-340,7
+340,7
@@
static void kill_player(struct PLAYER *ply)
int x = ply->x;
int y = ply->y;
int x = ply->x;
int y = ply->y;
- ply->alive =
0
;
+ ply->alive =
FALSE
;
switch (cave[x][y-1])
{
switch (cave[x][y-1])
{
@@
-1136,7
+1136,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
case Xswitch:
play_element_sound(x, y, SOUND_press, element);
lev.ball_cnt = lev.ball_time;
case Xswitch:
play_element_sound(x, y, SOUND_press, element);
lev.ball_cnt = lev.ball_time;
- lev.ball_
state = !lev.ball_stat
e;
+ lev.ball_
active = !lev.ball_activ
e;
break;
case Xplant:
break;
case Xplant:
@@
-1390,7
+1390,6
@@
static void check_player(struct PLAYER *ply)
ply->joy_stick = 1;
ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
ply->dynamite_cnt = 0; /* reset dynamite timer if we move */
ply->joy_stick = 1;
ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
ply->dynamite_cnt = 0; /* reset dynamite timer if we move */
- ply->joy_spin = !ply->joy_spin;
if (ply->joy_snap == 0) /* player wants to move */
{
if (ply->joy_snap == 0) /* player wants to move */
{
@@
-3962,9
+3961,9
@@
static void Lemerald_fall(int x, int y)
return;
case Xwonderwall:
return;
case Xwonderwall:
- if (lev.wonderwall_time)
+ if (lev.wonderwall_time
> 0
)
{
{
- lev.wonderwall_
state = 1
;
+ lev.wonderwall_
active = TRUE
;
cave[x][y] = Yemerald_sB;
next[x][y] = Xblank;
if (is_blank[cave[x][y+2]])
cave[x][y] = Yemerald_sB;
next[x][y] = Xblank;
if (is_blank[cave[x][y+2]])
@@
-4221,9
+4220,9
@@
static void Ldiamond_fall(int x, int y)
return;
case Xwonderwall:
return;
case Xwonderwall:
- if (lev.wonderwall_time)
+ if (lev.wonderwall_time
> 0
)
{
{
- lev.wonderwall_
state = 1
;
+ lev.wonderwall_
active = TRUE
;
cave[x][y] = Ydiamond_sB;
next[x][y] = Xblank;
if (is_blank[cave[x][y+2]])
cave[x][y] = Ydiamond_sB;
next[x][y] = Xblank;
if (is_blank[cave[x][y+2]])
@@
-4669,9
+4668,9
@@
static void Lstone_fall(int x, int y)
return;
case Xwonderwall:
return;
case Xwonderwall:
- if (lev.wonderwall_time)
+ if (lev.wonderwall_time
> 0
)
{
{
- lev.wonderwall_
state = 1
;
+ lev.wonderwall_
active = TRUE
;
cave[x][y] = Ystone_sB;
next[x][y] = Xblank;
if (is_blank[cave[x][y+2]])
cave[x][y] = Ystone_sB;
next[x][y] = Xblank;
if (is_blank[cave[x][y+2]])
@@
-6559,7
+6558,7
@@
static void Lball_common(int x, int y)
static void Lball_1(int x, int y)
{
static void Lball_1(int x, int y)
{
- if (
lev.ball_state == 0
)
+ if (
!lev.ball_active
)
return;
cave[x][y] = Yball_1;
return;
cave[x][y] = Yball_1;
@@
-6572,7
+6571,7
@@
static void Lball_1(int x, int y)
static void Lball_2(int x, int y)
{
static void Lball_2(int x, int y)
{
- if (
lev.ball_state == 0
)
+ if (
!lev.ball_active
)
return;
cave[x][y] = Yball_2;
return;
cave[x][y] = Yball_2;
@@
-6665,7
+6664,7
@@
static void Ldrip_stretchB(int x, int y)
static void Lwonderwall(int x, int y)
{
static void Lwonderwall(int x, int y)
{
- if (lev.wonderwall_time
&& lev.wonderwall_stat
e)
+ if (lev.wonderwall_time
> 0 && lev.wonderwall_activ
e)
{
cave[x][y] = Ywonderwall;
play_element_sound(x, y, SOUND_wonder, Xwonderwall);
{
cave[x][y] = Ywonderwall;
play_element_sound(x, y, SOUND_wonder, Xwonderwall);
@@
-6680,7
+6679,7
@@
static void Lwheel(int x, int y)
static void Lswitch(int x, int y)
{
static void Lswitch(int x, int y)
{
- if (lev.ball_
stat
e)
+ if (lev.ball_
activ
e)
cave[x][y] = Yswitch;
}
cave[x][y] = Yswitch;
}
@@
-7301,11
+7300,11
@@
static void logic_players(void)
game.centered_player_nr_next = i;
game.set_centered_player = TRUE;
game.centered_player_nr_next = i;
game.set_centered_player = TRUE;
- game.set_centered_player_
fast
= TRUE;
+ game.set_centered_player_
wrap
= TRUE;
}
}
- ply[i].
old
x = ply[i].x;
- ply[i].
old
y = ply[i].y;
+ ply[i].
prev_
x = ply[i].x;
+ ply[i].
prev_
y = ply[i].y;
ply[i].anim = PLY_still;
}
ply[i].anim = PLY_still;
}
@@
-7325,10
+7324,10
@@
static void logic_players(void)
if (!ply[i].alive)
continue;
if (!ply[i].alive)
continue;
- if (cave[ply[i].
oldx][ply[i].old
y] == Zplayer)
+ if (cave[ply[i].
prev_x][ply[i].prev_
y] == Zplayer)
{
{
- cave[ply[i].
oldx][ply[i].old
y] = Xblank;
- next[ply[i].
oldx][ply[i].old
y] = Xblank;
+ cave[ply[i].
prev_x][ply[i].prev_
y] = Xblank;
+ next[ply[i].
prev_x][ply[i].prev_
y] = Xblank;
}
if (cave[ply[i].x][ply[i].y] == Xblank)
}
if (cave[ply[i].x][ply[i].y] == Xblank)
@@
-7388,7
+7387,7
@@
static void logic_globals(void)
lev.android_move_cnt = lev.android_move_time;
if (lev.android_clone_cnt-- == 0)
lev.android_clone_cnt = lev.android_clone_time;
lev.android_move_cnt = lev.android_move_time;
if (lev.android_clone_cnt-- == 0)
lev.android_clone_cnt = lev.android_clone_time;
- if (lev.ball_
stat
e)
+ if (lev.ball_
activ
e)
if (lev.ball_cnt-- == 0)
lev.ball_cnt = lev.ball_time;
if (lev.lenses_cnt)
if (lev.ball_cnt-- == 0)
lev.ball_cnt = lev.ball_time;
if (lev.lenses_cnt)
@@
-7399,7
+7398,7
@@
static void logic_globals(void)
lev.wheel_cnt--;
if (lev.wind_cnt)
lev.wind_cnt--;
lev.wheel_cnt--;
if (lev.wind_cnt)
lev.wind_cnt--;
- if (lev.wonderwall_time
&& lev.wonderwall_stat
e)
+ if (lev.wonderwall_time
> 0 && lev.wonderwall_activ
e)
lev.wonderwall_time--;
if (lev.wheel_cnt)
lev.wonderwall_time--;
if (lev.wheel_cnt)