teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Send ObjectDelete packets when summoned creatures despawn

Browse source
This commit is contained in:
David Cernat 2017-06-02 09:15:08 +03:00
parent 0bed33e39e
commit 8c785fb22c
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwmechanics/actors.cpp
View file

@ -22,6 +22,7 @@
#include "../mwmp/PlayerList.hpp"
#include "../mwmp/CellController.hpp"
#include "../mwmp/MechanicsHelper.hpp"
#include "../mwmp/WorldEvent.hpp"
/*
End of tes3mp addition
*/
@ -1520,6 +1521,19 @@ namespace MWMechanics
{
MWBase::Environment::get().getWorld()->deleteObject(ptr);
/*
Start of tes3mp addition
Send an ID_OBJECT_DELETE packet every time a summoned creature despawns
*/
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset();
worldEvent->addObjectDelete(ptr);
worldEvent->sendObjectDelete();
/*
End of tes3mp addition
*/
const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
.search("VFX_Summon_End");
if (fx)

13
apps/openmw/mwmechanics/summoning.cpp
View file

@ -175,6 +175,19 @@ namespace MWMechanics
"", ptr.getRefData().getPosition().asVec3());
MWBase::Environment::get().getWorld()->deleteObject(ptr);
/*
Start of tes3mp addition
Send an ID_OBJECT_DELETE packet every time a summoned creature despawns
*/
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset();
worldEvent->addObjectDelete(ptr);
worldEvent->sendObjectDelete();
/*
End of tes3mp addition
*/
}
else
++it;

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

@ -3405,7 +3405,7 @@ namespace MWWorld
worldEvent->addObjectSpawn(ptr);
worldEvent->sendObjectSpawn();
MWBase::Environment::get().getWorld()->deleteObject(ptr);
deleteObject(ptr);
/*
End of tes3mp change (major)
*/