From 98af6368f824ddb95d7a86b63ee2f7e6b32c89ac Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Fri, 1 Dec 2006 17:18:04 +0000 Subject: forgot to include one file in the commit --- ChangeLog | 3 ++- src/gui/gui.cpp | 4 ++-- 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 - * 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); -- cgit v1.2.3-70-g09d2