summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/gui/gui.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 07f9f3e9..a751210e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2006-12-01 Philipp Sehmisch <tmw@crushnet.org>
- * src/net/beinghandler.cpp, src/being.h, src/being.cpp, src/monster.h:
+ * src/net/beinghandler.cpp, src/being.h, src/being.cpp, src/monster.h,
+ src/gui/gui.cpp:
Visible equipment slot numbers are now converted by the beinghandler from
eAthena to our system. No more distinction between monster attacking and
player attacking between beinghandler and the being classes.
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f148ef38..cceba658 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -211,7 +211,7 @@ Gui::logic()
int mouseX, mouseY;
Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
-
+
if ( mPlayerFollowMouse && button & SDL_BUTTON(1) &&
mWalkTime != player_node -> mWalkTime)
{
@@ -305,7 +305,7 @@ Gui::mousePress(int mx, int my, int button)
case Being::MONSTER:
case Being::PLAYER:
- if (being->mAction == Being::MONSTER_DEAD)
+ if (being->mAction == Being::DEAD)
break;
player_node->attack(being, true);