summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-30 20:44:11 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-30 20:44:11 +0000
commitb0564cea9b31b1078fd4f08992dfacaf97e911ae (patch)
treef3896689000761096c00d24eb28e4bfe6f6af96a /src
parentcc9e65b0f28943351234b4f048dea030ebb27582 (diff)
downloadmana-b0564cea9b31b1078fd4f08992dfacaf97e911ae.tar.gz
mana-b0564cea9b31b1078fd4f08992dfacaf97e911ae.tar.bz2
mana-b0564cea9b31b1078fd4f08992dfacaf97e911ae.tar.xz
mana-b0564cea9b31b1078fd4f08992dfacaf97e911ae.zip
Fixed players not always appearing to sit when they are in fact sitting.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/game.cpp b/src/game.cpp
index f84775b7..4f49df8d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -668,11 +668,11 @@ void do_parse()
being->speed = 150;
}
being->job = RFIFOW(14);
+ being->setHairStyle(RFIFOW(16));
+ being->setHairColor(RFIFOW(28));
being->x = get_x(RFIFOP(46));
being->y = get_y(RFIFOP(46));
being->direction = get_direction(RFIFOP(46));
- being->setHairColor(RFIFOW(28));
- being->setHairStyle(RFIFOW(16));
add_node(being);
}
else {
@@ -717,15 +717,19 @@ void do_parse()
add_node(being);
}
+ being->speed = RFIFOW(6);
being->job = RFIFOW(14);
+ being->setHairStyle(RFIFOW(16));
+ being->setHairColor(RFIFOW(28));
being->x = get_x(RFIFOP(46));
being->y = get_y(RFIFOP(46));
being->direction = get_direction(RFIFOP(46));
being->walk_time = tick_time;
being->frame = 0;
- being->speed = RFIFOW(6);
- being->setHairColor(RFIFOW(28));
- being->setHairStyle(RFIFOW(16));
+
+ if (RFIFOB(51) == 2) {
+ being->action = SIT;
+ }
break;
case SMSG_MOVE_BEING: