summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-06 17:17:04 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-06 17:17:04 +0000
commit1985aafdef0fabdf1a2f0857150d9119afae0976 (patch)
tree2016ae913dea1f50e25c6a6142e98efda845c9b0 /src
parentf86ed1d4785936f32bd2bc8c6d864608014de38a (diff)
downloadmana-1985aafdef0fabdf1a2f0857150d9119afae0976.tar.gz
mana-1985aafdef0fabdf1a2f0857150d9119afae0976.tar.bz2
mana-1985aafdef0fabdf1a2f0857150d9119afae0976.tar.xz
mana-1985aafdef0fabdf1a2f0857150d9119afae0976.zip
Added collision tileset and modified TMW client to support loading the 4th
map layer as collision layer.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index b5f0a9be..4d89bd67 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -504,7 +504,7 @@ void do_parse() {
break;
case 0x008e:
case 0x009a:
- if (RFIFOW(2)>4) {
+ if (RFIFOW(2) > 4) {
if(player_node->speech!=NULL) {
free(player_node->speech);
player_node->speech = NULL;
@@ -517,7 +517,7 @@ void do_parse() {
player_node->speech_time = SPEECH_TIME;
player_node->speech_color = 0;//makecol(255, 255, 255);
- if(id==0x008e) {
+ if (id == 0x008e) {
chatBox->chat_log(player_node->speech, BY_PLAYER);
}
else {