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 be2bed34a712bd36d7b2fa0fe9161d5fe979450e..9376c558929dcc821035e732eecf3d7caf4472d7 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-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];
@@
-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,11
+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 */
- if (
ply->joy_snap == 0)
/* player wants to move */
+ if (
!ply->joy_snap)
/* player wants to move */
{
boolean moved = FALSE;
{
boolean moved = FALSE;