Merge pull request #1390 from akortunov/referencecheck

Do not make target reference unavailable on cell change
pull/280/head
scrawl 7 years ago committed by GitHub
commit 1bdcecc32e

@ -20,9 +20,8 @@ namespace MWGui
{ {
MWWorld::CellStore* playerCell = MWMechanics::getPlayer().getCell(); MWWorld::CellStore* playerCell = MWMechanics::getPlayer().getCell();
// check if player has changed cell, or count of the reference has become 0 // check if count of the reference has become 0
if ((playerCell != mCurrentPlayerCell && mCurrentPlayerCell != NULL) if (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0)
|| (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0))
{ {
if (!mPtr.isEmpty()) if (!mPtr.isEmpty())
{ {

Loading…
Cancel
Save