mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-29 03:26:38 +00:00
Code Issues Releases Wiki Activity

changed PlayerPos::getPlayer return type from CellRef to Ptr

Browse source
This commit is contained in:
Marc Zinnschlag 2010-07-26 13:09:44 +02:00
parent fa50bbc77b
commit e43b475ade
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/playerpos.hpp
View file

@ -76,15 +76,11 @@ namespace MWRender
setPos(relX, relY, relZ); setPos(relX, relY, relZ);
} }
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *getPlayer() MWWorld::Ptr getPlayer()
{ {
return &mPlayer; MWWorld::Ptr ptr (&mPlayer, mCellStore);
return ptr;
} }
const ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *getPlayer() const
{
return &mPlayer;
}
}; };
} }
#endif #endif

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

@ -259,7 +259,7 @@ namespace MWWorld
// the player is always in an active cell. // the player is always in an active cell.
if (name=="player") if (name=="player")
{ {
return Ptr (mPlayerPos->getPlayer(), mCurrentCell); return mPlayerPos->getPlayer();
} }
// active cells // active cells