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

Remove redundant player cell variable

Browse source
This commit is contained in:
scrawl 2017-09-22 21:31:10 +02:00
parent 84657271c7
commit bbafe1e456
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,8 @@
#include "referenceinterface.hpp" #include "referenceinterface.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include "../mwmechanics/actorutil.hpp"
namespace MWGui namespace MWGui
{ {
ReferenceInterface::ReferenceInterface() ReferenceInterface::ReferenceInterface()
: mCurrentPlayerCell(NULL)
{ {
} }
@ -18,8 +12,6 @@ namespace MWGui
void ReferenceInterface::checkReferenceAvailable() void ReferenceInterface::checkReferenceAvailable()
{ {
MWWorld::CellStore* playerCell = MWMechanics::getPlayer().getCell();
// check if count of the reference has become 0 // check if count of the reference has become 0
if (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0) if (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0)
{ {
@ -29,7 +21,5 @@ namespace MWGui
onReferenceUnavailable(); onReferenceUnavailable();
} }
} }
mCurrentPlayerCell = playerCell;
} }
} }

5
apps/openmw/mwgui/referenceinterface.hpp
View file

@ -17,15 +17,12 @@ namespace MWGui
void checkReferenceAvailable(); ///< closes the window, if the MW-reference has become unavailable void checkReferenceAvailable(); ///< closes the window, if the MW-reference has become unavailable
virtual void resetReference() { mPtr = MWWorld::Ptr(); mCurrentPlayerCell = NULL; } virtual void resetReference() { mPtr = MWWorld::Ptr(); }
protected: protected:
virtual void onReferenceUnavailable() = 0; ///< called when reference has become unavailable virtual void onReferenceUnavailable() = 0; ///< called when reference has become unavailable
MWWorld::Ptr mPtr; MWWorld::Ptr mPtr;
private:
MWWorld::CellStore* mCurrentPlayerCell;
}; };
} }