diff options
author | Philipp Sehmisch <tmw@crushnet.org> | 2006-12-01 17:18:04 +0000 |
---|---|---|
committer | Philipp Sehmisch <tmw@crushnet.org> | 2006-12-01 17:18:04 +0000 |
commit | 98af6368f824ddb95d7a86b63ee2f7e6b32c89ac (patch) | |
tree | bc1f51b015af2283145cd53101a576f2edf0eb35 | |
parent | ab431cdfab6e1842ff357c7f380cc74142601912 (diff) | |
download | mana-client-98af6368f824ddb95d7a86b63ee2f7e6b32c89ac.tar.gz mana-client-98af6368f824ddb95d7a86b63ee2f7e6b32c89ac.tar.bz2 mana-client-98af6368f824ddb95d7a86b63ee2f7e6b32c89ac.tar.xz mana-client-98af6368f824ddb95d7a86b63ee2f7e6b32c89ac.zip |
forgot to include one file in the commit
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/gui/gui.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -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); |