mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 19:36:43 +00:00
Code Issues Releases Wiki Activity

[Client] Send ObjectPlace packet for random creatures interrupting rest

Browse source
This commit is contained in:
David Cernat 2017-05-25 01:00:47 +03:00
parent dbdb11b5f0
commit 97768be14b
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/hud.cpp
View file

@ -84,7 +84,7 @@ namespace MWGui
Start of tes3mp change (major) Start of tes3mp change (major)
Instead of actually keeping this object as is, delete it after sending the packet Instead of actually keeping this object as is, delete it after sending the packet
and wait for the server to send it back with the correct mpNum and wait for the server to send it back with a unique mpNum of its own
*/ */
MWBase::Environment::get().getWorld()->deleteObject(dropped); MWBase::Environment::get().getWorld()->deleteObject(dropped);
/* /*

2
apps/openmw/mwscript/transformationextensions.cpp
View file

@ -569,7 +569,7 @@ namespace MWScript
Start of tes3mp change (major) Start of tes3mp change (major)
Instead of actually keeping this object as is, delete it after sending the packet Instead of actually keeping this object as is, delete it after sending the packet
and wait for the server to send it back with the correct mpNum and wait for the server to send it back with a unique mpNum of its own
*/ */
MWBase::Environment::get().getWorld()->deleteObject(ptr); MWBase::Environment::get().getWorld()->deleteObject(ptr);
/* /*

18
apps/openmw/mwworld/worldimp.cpp
View file

@ -3392,7 +3392,23 @@ namespace MWWorld
MWWorld::ManualRef ref(getStore(), selectedCreature, 1); MWWorld::ManualRef ref(getStore(), selectedCreature, 1);
safePlaceObject(ref.getPtr(), getPlayerPtr(), getPlayerPtr().getCell(), 0, 220.f); /*
Start of tes3mp change (major)
Send an ID_OBJECT_PLACE packet every time a random creature is spawned, then delete
the creature and wait for the server to send it back with a unique mpNum of its own
*/
MWWorld::Ptr ptr = safePlaceObject(ref.getPtr(), getPlayerPtr(), getPlayerPtr().getCell(), 0, 220.f);
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset();
worldEvent->addObjectPlace(ptr);
worldEvent->sendObjectPlace();
MWBase::Environment::get().getWorld()->deleteObject(ptr);
/*
End of tes3mp change (major)
*/
} }
} }