mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 14:15:35 +00:00
Code Issues Releases Wiki Activity

searchPtrViaHandle

Browse source
This commit is contained in:
scrawl 2012-10-19 19:48:02 +02:00
parent 28cc480ce1
commit d76522e7a4
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -424,7 +424,7 @@ void OMW::Engine::activate()
if (handle.empty()) if (handle.empty())
return; return;
MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtrViaHandle (handle); MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaHandle (handle);
if (ptr.isEmpty()) if (ptr.isEmpty())
return; return;

3
apps/openmw/mwbase/world.hpp
View file

@ -142,6 +142,9 @@ namespace MWBase
virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0; virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0;
///< Return a pointer to a liveCellRef with the given Ogre handle. ///< Return a pointer to a liveCellRef with the given Ogre handle.
virtual MWWorld::Ptr searchPtrViaHandle (const std::string& handle) = 0;
///< Return a pointer to a liveCellRef with the given Ogre handle or Ptr() if not found
/// \todo enable reference in the OGRE scene /// \todo enable reference in the OGRE scene
virtual void enable (const MWWorld::Ptr& ptr) = 0; virtual void enable (const MWWorld::Ptr& ptr) = 0;

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

@ -245,15 +245,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
return; return;
std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle(); std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
MWWorld::Ptr object; MWWorld::Ptr object = MWBase::Environment::get().getWorld()->searchPtrViaHandle(handle);
try
{
object = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
}
catch (std::exception& /* e */)
{
return;
}
if (mode == GM_Console) if (mode == GM_Console)
MWBase::Environment::get().getWindowManager()->getConsole()->setSelectedObject(object); MWBase::Environment::get().getWindowManager()->getConsole()->setSelectedObject(object);

2
apps/openmw/mwgui/tooltips.cpp
View file

@ -80,7 +80,7 @@ void ToolTips::onFrame(float frameDuration)
{ {
std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle(); std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
mFocusObject = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle); mFocusObject = MWBase::Environment::get().getWorld()->searchPtrViaHandle(handle);
if (mFocusObject.isEmpty ()) if (mFocusObject.isEmpty ())
return; return;

10
apps/openmw/mwworld/worldimp.cpp
View file

@ -326,6 +326,14 @@ namespace MWWorld
} }
Ptr World::getPtrViaHandle (const std::string& handle) Ptr World::getPtrViaHandle (const std::string& handle)
{
Ptr res = searchPtrViaHandle (handle);
if (res.isEmpty ())
throw std::runtime_error ("unknown Ogre handle: " + handle);
return res;
}
Ptr World::searchPtrViaHandle (const std::string& handle)
{ {
if (mPlayer->getPlayer().getRefData().getHandle()==handle) if (mPlayer->getPlayer().getRefData().getHandle()==handle)
return mPlayer->getPlayer(); return mPlayer->getPlayer();
@ -850,7 +858,7 @@ namespace MWWorld
mWeatherManager->update (duration); mWeatherManager->update (duration);
// inform the GUI about focused object // inform the GUI about focused object
MWWorld::Ptr object = getPtrViaHandle(mFacedHandle); MWWorld::Ptr object = searchPtrViaHandle(mFacedHandle);
MWBase::Environment::get().getWindowManager()->setFocusObject(object); MWBase::Environment::get().getWindowManager()->setFocusObject(object);

3
apps/openmw/mwworld/worldimp.hpp
View file

@ -163,6 +163,9 @@ namespace MWWorld
virtual Ptr getPtrViaHandle (const std::string& handle); virtual Ptr getPtrViaHandle (const std::string& handle);
///< Return a pointer to a liveCellRef with the given Ogre handle. ///< Return a pointer to a liveCellRef with the given Ogre handle.
virtual Ptr searchPtrViaHandle (const std::string& handle);
///< Return a pointer to a liveCellRef with the given Ogre handle or Ptr() if not found
virtual void enable (const Ptr& ptr); virtual void enable (const Ptr& ptr);
virtual void disable (const Ptr& ptr); virtual void disable (const Ptr& ptr);