mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 20:36:42 +00:00
Code Issues Releases Wiki Activity

[Client] Add generic objects to ObjectList using addObjectGeneric()

Browse source
This commit is contained in:
David Cernat 2020-01-23 09:03:40 +02:00
parent 989188c171
commit 59a38164ea
8 changed files with 15 additions and 8 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->addObject(objectList->getObjectFromPtr(mPtr)); objectList->addObjectGeneric(mPtr);
objectList->sendObjectDelete(); objectList->sendObjectDelete();
/* /*
End of tes3mp change (major) End of tes3mp change (major)

4
apps/openmw/mwgui/containeritemmodel.cpp
View file

@ -2,8 +2,6 @@
#include <algorithm> #include <algorithm>
#include <components/openmw-mp/TimedLog.hpp>
/* /*
Start of tes3mp addition Start of tes3mp addition
@ -209,7 +207,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->addObject(objectList->getObjectFromPtr(source)); objectList->addObjectGeneric(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->addObject(objectList->getObjectFromPtr(object)); objectList->addObjectGeneric(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->addObject(objectList->getObjectFromPtr(ptr)); objectList->addObjectGeneric(ptr);
objectList->sendObjectDelete(); objectList->sendObjectDelete();
} }
/* /*

8
apps/openmw/mwmp/ObjectList.cpp
View file

@ -969,6 +969,14 @@ void ObjectList::addRequestedContainers(MWWorld::CellStore* cellStore, const std
} }
} }
void ObjectList::addObjectGeneric(const MWWorld::Ptr& ptr)
{
cell = *ptr.getCell()->getCell();
mwmp::BaseObject baseObject = getObjectFromPtr(ptr);
addObject(baseObject);
}
void ObjectList::addObjectActivate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& activatingActor) void ObjectList::addObjectActivate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& activatingActor)
{ {
cell = *ptr.getCell()->getCell(); cell = *ptr.getCell()->getCell();

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

@ -52,6 +52,7 @@ namespace mwmp
void addAllContainers(MWWorld::CellStore* cellStore); void addAllContainers(MWWorld::CellStore* cellStore);
void addRequestedContainers(MWWorld::CellStore* cellStore, const std::vector<BaseObject>& requestObjects); void addRequestedContainers(MWWorld::CellStore* cellStore, const std::vector<BaseObject>& requestObjects);
void addObjectGeneric(const MWWorld::Ptr& ptr);
void addObjectActivate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& activatingActor); void addObjectActivate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& activatingActor);
void addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor); void addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor);
void addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor, const Attack hitAttack); void addObjectHit(const MWWorld::Ptr& ptr, const MWWorld::Ptr& hittingActor, const Attack hitAttack);

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->addObject(objectList->getObjectFromPtr(ptr)); objectList->addObjectGeneric(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->addObject(objectList->getObjectFromPtr(getTarget())); objectList->addObjectGeneric(getTarget());
objectList->sendObjectDelete(); objectList->sendObjectDelete();
/* /*
End of tes3mp addition End of tes3mp addition