projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed type of some variables
[rocksndiamonds.git]
/
src
/
game_em
/
logic.c
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index 001e47b0bb4516e591d572d8f7aac307f8536fcc..9376c558929dcc821035e732eecf3d7caf4472d7 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-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])
{
@@
-501,7
+501,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
if (dx && dy && ply->joy_snap) /* more than one direction specified */
return FALSE;
if (dx && dy && ply->joy_snap) /* more than one direction specified */
return FALSE;
- if (
ply->joy_snap == 0)
/* player wants to move */
+ if (
!ply->joy_snap)
/* player wants to move */
{
int element = cave[x][y];
{
int element = cave[x][y];
@@
-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:
@@
-1357,7
+1357,10
@@
static void check_player(struct PLAYER *ply)
if (!can_move)
{
if (!can_move)
{
- ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+ ply->joy_n = FALSE;
+ ply->joy_e = FALSE;
+ ply->joy_s = FALSE;
+ ply->joy_w = FALSE;
return;
}
return;
}
@@
-1365,7
+1368,7
@@
static void check_player(struct PLAYER *ply)
if (dx == 0 && dy == 0)
{
if (dx == 0 && dy == 0)
{
- ply->joy_stick =
0
;
+ ply->joy_stick =
FALSE
;
if (ply->joy_drop)
{
if (ply->joy_drop)
{
@@
-1387,12
+1390,15
@@
static void check_player(struct PLAYER *ply)
return;
}
return;
}
- ply->joy_stick = 1;
- ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+ ply->joy_stick = TRUE;
+ ply->joy_n = FALSE;
+ ply->joy_e = FALSE;
+ ply->joy_s = FALSE;
+ ply->joy_w = FALSE;
+
ply->dynamite_cnt = 0; /* reset dynamite timer if we move */
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)
/* player wants to move */
{
boolean moved = FALSE;
{
boolean moved = FALSE;
@@
-3962,9
+3968,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
+4227,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
+4675,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
+6565,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
+6578,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
+6671,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
+6686,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;
}
@@
-7304,8
+7310,8
@@
static void logic_players(void)
game.set_centered_player_wrap = 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
+7331,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
+7394,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
+7405,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)