diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-07-19 23:22:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-07-19 23:22:41 +0300 |
| commit | 50658d0b86e7fcd0ea92449310b1dbcc75237267 (patch) | |
| tree | 888e3c812b869995d13bd33cc0591d94ccade2e9 /src/gui | |
| parent | ce234e915f6ee5557e6cc00b6aa9fd9b3bdbc152 (diff) | |
| download | manaplus-50658d0b86e7fcd0ea92449310b1dbcc75237267.tar.gz manaplus-50658d0b86e7fcd0ea92449310b1dbcc75237267.tar.bz2 manaplus-50658d0b86e7fcd0ea92449310b1dbcc75237267.tar.xz manaplus-50658d0b86e7fcd0ea92449310b1dbcc75237267.zip | |
Block moving in storage is open.
Move some code from being to playerinfo.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/viewport.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 319476591..2a8d36a60 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -33,6 +33,7 @@ #include "localplayer.h" #include "map.h" #include "maplayer.h" +#include "playerinfo.h" #include "textmanager.h" #include "gui/beingpopup.h" @@ -409,7 +410,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) // Check if we are busy // if commented, allow context menu if npc dialog open - if (Being::isTalking()) + if (PlayerInfo::isTalking()) return; const int pixelX = event.getX() + mPixelViewX; |