From 4ff5c3b854215b1f55e70106a4c53225fc953619 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 2 Mar 2010 13:34:11 +0000 Subject: Revert "Fix using custom cursors" This reverts commit d194ea8220658b6ef84522f01fa3cf0d0200545e. --- src/gui/viewport.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/gui') 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(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()) -- cgit v1.2.3-70-g09d2