teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

integrated name-lookup into ape's code; added missing implementation of a function

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-03 22:06:48 +02:00
parent 5827591d05
commit 052d049a6c
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/engine.cpp
View file

@ -24,6 +24,7 @@
#include "mwworld/world.hpp"
#include "mwworld/ptr.hpp"
#include "mwworld/environment.hpp"
#include "mwworld/class.hpp"
#include "mwclass/classes.hpp"
@ -74,8 +75,21 @@ bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
if (focusFrameCounter++ == focusUpdateFrame)
{
std::pair<std::string, float> handle = mEnvironment.mWorld->getMWScene()->getFacedHandle();
std::cout << "Object: " << handle.first << ", distance: " << handle.second << std::endl;
std::string name;
if (!handle.first.empty())
{
// TODO compare handle.second with max activation range (from a GMST)
MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle.first);
if (!ptr.isEmpty())
name = MWWorld::Class::get (ptr).getName (ptr);
}
if (!name.empty())
std::cout << "Object: " << name << ", distance: " << handle.second << std::endl;
focusFrameCounter = 0;
}
@ -244,7 +258,7 @@ void OMW::Engine::go()
*mEnvironment.mWindowManager, mDebug);
focusFrameCounter = 0;
std::cout << "\nPress Q/ESC or close window to exit.\n";
mOgre.getRoot()->addFrameListener (this);

9
apps/openmw/mwworld/world.cpp
View file

@ -42,6 +42,15 @@ namespace
ESMS::LiveCellRef<T, MWWorld::RefData> *searchViaHandle (const std::string& handle,
ESMS::CellRefList<T, MWWorld::RefData>& refList)
{
typedef typename ESMS::CellRefList<T, MWWorld::RefData>::List::iterator iterator;
for (iterator iter (refList.list.begin()); iter!=refList.list.end(); ++iter)
{
if (iter->mData.getHandle()==handle)
{
return &*iter;
}
}
return 0;
}