diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
commit | 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (patch) | |
tree | 95684590a32266b28f046475cfa1926c99f67e52 /src/gui/viewport.cpp | |
parent | cf36850d2bdda67cb472d938ed58053a92fa6935 (diff) | |
download | mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.gz mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.bz2 mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.xz mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.zip |
Merged revisions 3629-3630 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(but kept looks in Being class, since eAthena works that way)
........
r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line
Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items.
........
r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line
Fixed changelog message.
........
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r-- | src/gui/viewport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index a39db509..2c664176 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -369,7 +369,7 @@ Viewport::mousePressed(gcn::MouseEvent &event) FloorItem *floorItem; if ((being = beingManager->findBeing(tilex, tiley)) && - being->getType() != Being::LOCALPLAYER) + being != player_node) { mPopupMenu->showPopup(event.getX(), event.getY(), being); return; |