diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-01 21:32:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-01 21:35:09 -0600 |
| commit | a3e61c0e830c46b51c0d135962ad361c02b93243 (patch) | |
| tree | 3b94948be5750c8f968ea89723799eb4f119c063 /src/being.cpp | |
| parent | 0e189bbe81c88283438aabb4fec3ba30920d3a36 (diff) | |
| download | mana-a3e61c0e830c46b51c0d135962ad361c02b93243.tar.gz mana-a3e61c0e830c46b51c0d135962ad361c02b93243.tar.bz2 mana-a3e61c0e830c46b51c0d135962ad361c02b93243.tar.xz mana-a3e61c0e830c46b51c0d135962ad361c02b93243.zip | |
Remove isActive methods from buy/sell windows
Uses a state variable in PlayerInfo instead. Moves isTalking from Being
to PlayerInfo. Also some small cleanups.
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/being.cpp b/src/being.cpp index 22fb9610..280a5a1b 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -39,12 +39,7 @@ #include "text.h" #include "statuseffect.h" -#include "gui/buy.h" -#include "gui/buysell.h" #include "gui/gui.h" -#include "gui/npcdialog.h" -#include "gui/npcpostdialog.h" -#include "gui/sell.h" #include "gui/socialwindow.h" #include "gui/speechbubble.h" #include "gui/theme.h" @@ -1203,10 +1198,3 @@ void Being::talkTo() { Net::getNpcHandler()->talk(mId); } - -bool Being::isTalking() -{ - return NpcDialog::isActive() || BuyDialog::isActive() || - SellDialog::isActive() || BuySellDialog::isActive() || - NpcPostDialog::isActive(); -} |