mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 20:11:36 +00:00
Code Issues Releases Wiki Activity

Fix manually changed mouse cursor

Browse source
This commit is contained in:
scrawl 2013-03-07 12:46:26 +01:00
parent 8be9627c8d
commit e34685b8a3
5 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/windowmanager.hpp
View file

@ -237,6 +237,8 @@ namespace MWBase
virtual void startEnchanting(MWWorld::Ptr actor) = 0; virtual void startEnchanting(MWWorld::Ptr actor) = 0;
virtual void startTraining(MWWorld::Ptr actor) = 0; virtual void startTraining(MWWorld::Ptr actor) = 0;
virtual void changePointer (const std::string& name) = 0;
virtual const Translation::Storage& getTranslationDataStorage() const = 0; virtual const Translation::Storage& getTranslationDataStorage() const = 0;
}; };
} }

5
apps/openmw/mwgui/cursor.cpp
View file

@ -13,8 +13,9 @@ namespace MWGui
{ {
ResourceImageSetPointerFix::ResourceImageSetPointerFix() : ResourceImageSetPointerFix::ResourceImageSetPointerFix()
mImageSet(NULL) : mImageSet(NULL)
, mRotation(0)
{ {
} }

11
apps/openmw/mwgui/hud.cpp
View file

@ -4,7 +4,6 @@
#include <MyGUI_Widget.h> #include <MyGUI_Widget.h>
#include <MyGUI_RenderManager.h> #include <MyGUI_RenderManager.h>
#include <MyGUI_PointerManager.h>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
@ -222,7 +221,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
else else
world->dropObjectOnGround(world->getPlayer().getPlayer(), object); world->dropObjectOnGround(world->getPlayer().getPlayer(), object);
MyGUI::PointerManager::getInstance().setPointer("arrow"); MWBase::Environment::get().getWindowManager()->changePointer("arrow");
std::string sound = MWWorld::Class::get(object).getDownSoundId(object); std::string sound = MWWorld::Class::get(object).getDownSoundId(object);
MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0); MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
@ -273,21 +272,21 @@ void HUD::onWorldMouseOver(MyGUI::Widget* _sender, int x, int y)
bool canDrop = world->canPlaceObject(mouseX, mouseY); bool canDrop = world->canPlaceObject(mouseX, mouseY);
if (!canDrop) if (!canDrop)
MyGUI::PointerManager::getInstance().setPointer("drop_ground"); MWBase::Environment::get().getWindowManager()->changePointer("drop_ground");
else else
MyGUI::PointerManager::getInstance().setPointer("arrow"); MWBase::Environment::get().getWindowManager()->changePointer("arrow");
} }
else else
{ {
MyGUI::PointerManager::getInstance().setPointer("arrow"); MWBase::Environment::get().getWindowManager()->changePointer("arrow");
mWorldMouseOver = true; mWorldMouseOver = true;
} }
} }
void HUD::onWorldMouseLostFocus(MyGUI::Widget* _sender, MyGUI::Widget* _new) void HUD::onWorldMouseLostFocus(MyGUI::Widget* _sender, MyGUI::Widget* _new)
{ {
MyGUI::PointerManager::getInstance().setPointer("arrow"); MWBase::Environment::get().getWindowManager()->changePointer("arrow");
mWorldMouseOver = false; mWorldMouseOver = false;
} }

5
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1127,3 +1127,8 @@ const Translation::Storage& WindowManager::getTranslationDataStorage() const
{ {
return mTranslationDataStorage; return mTranslationDataStorage;
} }
void WindowManager::changePointer(const std::string &name)
{
mCursor->onCursorChange(name);
}

2
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -228,6 +228,8 @@ namespace MWGui
virtual void startEnchanting(MWWorld::Ptr actor); virtual void startEnchanting(MWWorld::Ptr actor);
virtual void startTraining(MWWorld::Ptr actor); virtual void startTraining(MWWorld::Ptr actor);
virtual void changePointer (const std::string& name);
virtual const Translation::Storage& getTranslationDataStorage() const; virtual const Translation::Storage& getTranslationDataStorage() const;
private: private: