mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Use moveToCell and init mwscript

Browse Source
This commit is contained in:
Evil Eye 2023-09-27 21:23:07 +02:00
parent 641f34a3c9
commit 33b57d9134
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwclass/misc.cpp
View File

@ -205,8 +205,7 @@ namespace MWClass
newPtr = MWWorld::Ptr(cell.insert(ref), &cell); newPtr = MWWorld::Ptr(cell.insert(ref), &cell);
newPtr.getRefData().setCount(count); newPtr.getRefData().setCount(count);
} }
if (ptr.getCell() != &MWBase::Environment::get().getWorldModel()->getDraftCell()) newPtr.getCellRef().unsetRefNum();
newPtr.getCellRef().unsetRefNum();
newPtr.getRefData().setLuaScripts(nullptr); newPtr.getRefData().setLuaScripts(nullptr);
MWBase::Environment::get().getWorldModel()->registerPtr(newPtr); MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);
return newPtr; return newPtr;

12
apps/openmw/mwlua/objectbindings.cpp
View File

@ -11,6 +11,7 @@
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp" #include "../mwworld/containerstore.hpp"
#include "../mwworld/localscripts.hpp"
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "../mwworld/scene.hpp" #include "../mwworld/scene.hpp"
#include "../mwworld/worldmodel.hpp" #include "../mwworld/worldmodel.hpp"
@ -112,17 +113,22 @@ namespace MWLua
const MWWorld::Class& cls = ptr.getClass(); const MWWorld::Class& cls = ptr.getClass();
if (cls.isActor()) if (cls.isActor())
{ {
auto& stats = ptr.getClass().getCreatureStats(ptr); auto& stats = cls.getCreatureStats(ptr);
stats.land(false); stats.land(false);
stats.setTeleported(true); stats.setTeleported(true);
} }
const MWWorld::CellStore* srcCell = ptr.getCell();
MWWorld::Ptr newPtr; MWWorld::Ptr newPtr;
if (ptr.getCell() == &wm->getDraftCell()) if (srcCell == &wm->getDraftCell())
{ {
newPtr = world->placeObject(ptr, destCell, toPos(pos, rot)); newPtr = cls.moveToCell(ptr, *destCell, toPos(pos, rot));
ptr.getCellRef().unsetRefNum(); ptr.getCellRef().unsetRefNum();
ptr.getRefData().setLuaScripts(nullptr); ptr.getRefData().setLuaScripts(nullptr);
ptr.getRefData().setCount(0); ptr.getRefData().setCount(0);
ESM::RefId script = cls.getScript(newPtr);
if (!script.empty())
world->getLocalScripts().add(script, newPtr);
world->addContainerScripts(newPtr, newPtr.getCell());
} }
else else
{ {

3
apps/openmw/mwworld/class.cpp
View File

@ -372,8 +372,7 @@ namespace MWWorld
MWWorld::Ptr Class::copyToCell(const ConstPtr& ptr, CellStore& cell, int count) const MWWorld::Ptr Class::copyToCell(const ConstPtr& ptr, CellStore& cell, int count) const
{ {
Ptr newPtr = copyToCellImpl(ptr, cell); Ptr newPtr = copyToCellImpl(ptr, cell);
if (ptr.getCell() != &MWBase::Environment::get().getWorldModel()->getDraftCell()) newPtr.getCellRef().unsetRefNum(); // This RefNum is only valid within the original cell of the reference
newPtr.getCellRef().unsetRefNum(); // This RefNum is only valid within the original cell of the reference
newPtr.getRefData().setCount(count); newPtr.getRefData().setCount(count);
newPtr.getRefData().setLuaScripts(nullptr); newPtr.getRefData().setLuaScripts(nullptr);
MWBase::Environment::get().getWorldModel()->registerPtr(newPtr); MWBase::Environment::get().getWorldModel()->registerPtr(newPtr);