summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/game.cpp14
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f55661fa..a9eac193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,12 +5,13 @@
- Added confirmation dialog before quitting
- Added button to show/hide equipment window
- Added framerate limiter to config options
+- Added ability to auto attack
- Upgraded to Guichan 0.4.0
- Dialogs are now modal when appropriate
- Fixed a crash in OpenGL mode
- Fixed rendering of minimap, progress bars and player sprite in OpenGL mode
- Fixed 100% CPU usage when minimized
-- Added ability to auto attack
+- Fixed players not always appearing to sit when they are in fact sitting
0.0.12 (1 May 2005)
- Added new map (a cave), tiles, monsters and items
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: