summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-09-08 22:48:48 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-09-08 22:48:48 +0000
commitb3a64dc0c6db8c2f2a6faf5e3d2cd11c81713114 (patch)
tree1e06f3964ddb677888b63b4e7265188925492674 /src/game.cpp
parent0ba846818fcfd01142c0c615adc487e342e5f243 (diff)
downloadmana-client-b3a64dc0c6db8c2f2a6faf5e3d2cd11c81713114.tar.gz
mana-client-b3a64dc0c6db8c2f2a6faf5e3d2cd11c81713114.tar.bz2
mana-client-b3a64dc0c6db8c2f2a6faf5e3d2cd11c81713114.tar.xz
mana-client-b3a64dc0c6db8c2f2a6faf5e3d2cd11c81713114.zip
Removed inclusion of malloc.h header as it doens't seem necessary and was
problematic on FreeBSD.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 80cec17d..45bc4dce 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -924,7 +924,8 @@ void do_input()
}
}
- if (joy[JOY_BTN1]) {
+ if (joy[JOY_BTN1])
+ {
unsigned short x = player_node->x;
unsigned short y = player_node->y;
int id = find_floor_item_by_cor(x, y);
@@ -936,7 +937,8 @@ void do_input()
WFIFOSET(6);
}
}
- else if (joy[JOY_BTN2] && action_time) {
+ else if (joy[JOY_BTN2] && action_time)
+ {
if (player_node->action == Being::STAND)
action(2, 0);
else if (player_node->action == Being::SIT)