diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:34:11 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:34:11 +0000 |
| commit | 4ff5c3b854215b1f55e70106a4c53225fc953619 (patch) | |
| tree | 7a7c43fb950add7ab991459cf91af23c02cb4309 | |
| parent | d194ea8220658b6ef84522f01fa3cf0d0200545e (diff) | |
| download | mana-4ff5c3b854215b1f55e70106a4c53225fc953619.tar.gz mana-4ff5c3b854215b1f55e70106a4c53225fc953619.tar.bz2 mana-4ff5c3b854215b1f55e70106a4c53225fc953619.tar.xz mana-4ff5c3b854215b1f55e70106a4c53225fc953619.zip | |
Revert "Fix using custom cursors"
This reverts commit d194ea8220658b6ef84522f01fa3cf0d0200545e.
| -rw-r--r-- | src/gui/viewport.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 9633cbd5..a36f91cf 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -468,7 +468,8 @@ void Viewport::mouseMoved(gcn::MouseEvent &event) const int y = (event.getY() + (int) mPixelViewY); mHoverBeing = beingManager->findBeingByPixel(x, y); - if (mHoverBeing && mHoverBeing->getType() == Being::PLAYER) + if (mHoverBeing && mHoverBeing->getType() == Being::PLAYER && + event.getSource() == this) mBeingPopup->show(getMouseX(), getMouseY(), static_cast<Player*>(mHoverBeing)); else @@ -477,10 +478,6 @@ void Viewport::mouseMoved(gcn::MouseEvent &event) mHoverItem = floorItemManager->findByCoordinates(x / mMap->getTileWidth(), y / mMap->getTileHeight()); - // Don't change the cursor if the mouse is over something else - if (event.getSource() != this) - return; - if (mHoverBeing) { switch (mHoverBeing->getType()) |