1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 09:39:56 +00:00

Merge branch 'stay_disabled' into 'master'

Only add enabled objects to the scene

Closes #6302

See merge request OpenMW/openmw!1246
This commit is contained in:
psi29a 2021-09-28 06:16:33 +00:00
commit 89af82684c
2 changed files with 3 additions and 1 deletions

View File

@ -40,6 +40,7 @@
Bug #6282: Laura craft doesn't follow the player character
Bug #6283: Avis Dorsey follows you after her death
Bug #6289: Keyword search in dialogues expected the text to be all ASCII characters
Bug #6302: Teleporting disabled actor breaks its disabled state
Feature #890: OpenMW-CS: Column filtering
Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record
Feature #2780: A way to see current OpenMW version in the console

View File

@ -1159,7 +1159,8 @@ namespace MWWorld
if (!currCellActive && newCellActive)
{
newPtr = currCell->moveTo(ptr, newCell);
mWorldScene->addObjectToScene(newPtr);
if(newPtr.getRefData().isEnabled())
mWorldScene->addObjectToScene(newPtr);
std::string script = newPtr.getClass().getScript(newPtr);
if (!script.empty())