From 989188c171870aaac76004b807d0101b632ec983 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 22 Jan 2020 14:35:51 +0200 Subject: [PATCH] [Client] Remove ObjectList's confusing addObjectDelete() function --- apps/openmw/mwgui/container.cpp | 2 +- apps/openmw/mwgui/containeritemmodel.cpp | 2 +- apps/openmw/mwgui/inventorywindow.cpp | 2 +- apps/openmw/mwmechanics/actors.cpp | 2 +- apps/openmw/mwmp/ObjectList.cpp | 11 ----------- apps/openmw/mwmp/ObjectList.hpp | 1 - apps/openmw/mwscript/miscextensions.cpp | 2 +- apps/openmw/mwworld/actiontake.cpp | 2 +- 8 files changed, 6 insertions(+), 18 deletions(-) diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 3233797d0..1d8f04dff 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -415,7 +415,7 @@ namespace MWGui mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; - objectList->addObjectDelete(mPtr); + objectList->addObject(objectList->getObjectFromPtr(mPtr)); objectList->sendObjectDelete(); /* End of tes3mp change (major) diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp index 0e16fa601..57f8849a4 100644 --- a/apps/openmw/mwgui/containeritemmodel.cpp +++ b/apps/openmw/mwgui/containeritemmodel.cpp @@ -209,7 +209,7 @@ void ContainerItemModel::removeItem (const ItemStack& item, size_t count) mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; - objectList->addObjectDelete(source); + objectList->addObject(objectList->getObjectFromPtr(source)); objectList->sendObjectDelete(); /* End of tes3mp addition diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index df13c47aa..0f24132d8 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -774,7 +774,7 @@ namespace MWGui mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; - objectList->addObjectDelete(object); + objectList->addObject(objectList->getObjectFromPtr(object)); objectList->sendObjectDelete(); /* End of tes3mp addition diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 657003bdd..9c1321236 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -2119,7 +2119,7 @@ namespace MWMechanics mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; - objectList->addObjectDelete(ptr); + objectList->addObject(objectList->getObjectFromPtr(ptr)); objectList->sendObjectDelete(); } /* diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp index 31713a0ee..783968d14 100644 --- a/apps/openmw/mwmp/ObjectList.cpp +++ b/apps/openmw/mwmp/ObjectList.cpp @@ -1081,17 +1081,6 @@ void ObjectList::addObjectSpawn(const MWWorld::Ptr& ptr, const MWWorld::Ptr& mas addObject(baseObject); } -void ObjectList::addObjectDelete(const MWWorld::Ptr& ptr) -{ - cell = *ptr.getCell()->getCell(); - - mwmp::BaseObject baseObject; - baseObject.refId = ptr.getCellRef().getRefId(); - baseObject.refNum = ptr.getCellRef().getRefNum().mIndex; - baseObject.mpNum = ptr.getCellRef().getMpNum(); - addObject(baseObject); -} - void ObjectList::addObjectLock(const MWWorld::Ptr& ptr, int lockLevel) { cell = *ptr.getCell()->getCell(); diff --git a/apps/openmw/mwmp/ObjectList.hpp b/apps/openmw/mwmp/ObjectList.hpp index 25328a042..edf8acb88 100644 --- a/apps/openmw/mwmp/ObjectList.hpp +++ b/apps/openmw/mwmp/ObjectList.hpp @@ -58,7 +58,6 @@ namespace mwmp void addObjectPlace(const MWWorld::Ptr& ptr, bool droppedByPlayer = false); void addObjectSpawn(const MWWorld::Ptr& ptr); void addObjectSpawn(const MWWorld::Ptr& ptr, const MWWorld::Ptr& master, std::string spellId, int effectId, float duration); - void addObjectDelete(const MWWorld::Ptr& ptr); void addObjectLock(const MWWorld::Ptr& ptr, int lockLevel); void addObjectTrap(const MWWorld::Ptr& ptr, const ESM::Position& pos, bool isDisarmed); void addObjectScale(const MWWorld::Ptr& ptr, float scale); diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp index 035cb131d..b3172100e 100644 --- a/apps/openmw/mwscript/miscextensions.cpp +++ b/apps/openmw/mwscript/miscextensions.cpp @@ -828,7 +828,7 @@ namespace MWScript mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = ScriptController::getPacketOriginFromContextType(runtime.getContext().getContextType()); - objectList->addObjectDelete(ptr); + objectList->addObject(objectList->getObjectFromPtr(ptr)); objectList->sendObjectDelete(); } /* diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp index 8ff1f1f45..52dcaed15 100644 --- a/apps/openmw/mwworld/actiontake.cpp +++ b/apps/openmw/mwworld/actiontake.cpp @@ -52,7 +52,7 @@ namespace MWWorld mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; - objectList->addObjectDelete(getTarget()); + objectList->addObject(objectList->getObjectFromPtr(getTarget())); objectList->sendObjectDelete(); /* End of tes3mp addition