AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Remove ObjectList's confusing addObjectDelete() function

Browse Source
This commit is contained in:
David Cernat 2020-01-22 14:35:51 +02:00
parent 27b9357478
commit 989188c171
8 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/container.cpp
View File

@ -415,7 +415,7 @@ namespace MWGui
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectDelete(mPtr); objectList->addObject(objectList->getObjectFromPtr(mPtr));
objectList->sendObjectDelete(); objectList->sendObjectDelete();
/* /*
End of tes3mp change (major) End of tes3mp change (major)

2
apps/openmw/mwgui/containeritemmodel.cpp
View File

@ -209,7 +209,7 @@ void ContainerItemModel::removeItem (const ItemStack& item, size_t count)
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectDelete(source); objectList->addObject(objectList->getObjectFromPtr(source));
objectList->sendObjectDelete(); objectList->sendObjectDelete();
/* /*
End of tes3mp addition End of tes3mp addition

2
apps/openmw/mwgui/inventorywindow.cpp
View File

@ -774,7 +774,7 @@ namespace MWGui
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectDelete(object); objectList->addObject(objectList->getObjectFromPtr(object));
objectList->sendObjectDelete(); objectList->sendObjectDelete();
/* /*
End of tes3mp addition End of tes3mp addition

2
apps/openmw/mwmechanics/actors.cpp
View File

@ -2119,7 +2119,7 @@ namespace MWMechanics
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectDelete(ptr); objectList->addObject(objectList->getObjectFromPtr(ptr));
objectList->sendObjectDelete(); objectList->sendObjectDelete();
} }
/* /*

11
apps/openmw/mwmp/ObjectList.cpp
View File

@ -1081,17 +1081,6 @@ void ObjectList::addObjectSpawn(const MWWorld::Ptr& ptr, const MWWorld::Ptr& mas
addObject(baseObject); 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) void ObjectList::addObjectLock(const MWWorld::Ptr& ptr, int lockLevel)
{ {
cell = *ptr.getCell()->getCell(); cell = *ptr.getCell()->getCell();

1
apps/openmw/mwmp/ObjectList.hpp
View File

@ -58,7 +58,6 @@ namespace mwmp
void addObjectPlace(const MWWorld::Ptr& ptr, bool droppedByPlayer = false); void addObjectPlace(const MWWorld::Ptr& ptr, bool droppedByPlayer = false);
void addObjectSpawn(const MWWorld::Ptr& ptr); void addObjectSpawn(const MWWorld::Ptr& ptr);
void addObjectSpawn(const MWWorld::Ptr& ptr, const MWWorld::Ptr& master, std::string spellId, int effectId, float duration); 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 addObjectLock(const MWWorld::Ptr& ptr, int lockLevel);
void addObjectTrap(const MWWorld::Ptr& ptr, const ESM::Position& pos, bool isDisarmed); void addObjectTrap(const MWWorld::Ptr& ptr, const ESM::Position& pos, bool isDisarmed);
void addObjectScale(const MWWorld::Ptr& ptr, float scale); void addObjectScale(const MWWorld::Ptr& ptr, float scale);

2
apps/openmw/mwscript/miscextensions.cpp
View File

@ -828,7 +828,7 @@ namespace MWScript
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = ScriptController::getPacketOriginFromContextType(runtime.getContext().getContextType()); objectList->packetOrigin = ScriptController::getPacketOriginFromContextType(runtime.getContext().getContextType());
objectList->addObjectDelete(ptr); objectList->addObject(objectList->getObjectFromPtr(ptr));
objectList->sendObjectDelete(); objectList->sendObjectDelete();
} }
/* /*

2
apps/openmw/mwworld/actiontake.cpp
View File

@ -52,7 +52,7 @@ namespace MWWorld
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectDelete(getTarget()); objectList->addObject(objectList->getObjectFromPtr(getTarget()));
objectList->sendObjectDelete(); objectList->sendObjectDelete();
/* /*
End of tes3mp addition End of tes3mp addition