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

[Client] Don't send ObjectSound packets for dedicated actor actions

Browse source
This commit is contained in:
David Cernat 2020-05-25 23:43:20 +03:00
parent c99e20e3b4
commit 76538ab3cd
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwworld/action.cpp
View file

@ -7,6 +7,7 @@
*/ */
#include "../mwmp/Main.hpp" #include "../mwmp/Main.hpp"
#include "../mwmp/Networking.hpp" #include "../mwmp/Networking.hpp"
#include "../mwmp/CellController.hpp"
#include "../mwmp/ObjectList.hpp" #include "../mwmp/ObjectList.hpp"
/* /*
End of tes3mp addition End of tes3mp addition
@ -57,7 +58,7 @@ void MWWorld::Action::execute (const Ptr& actor, bool noSound)
/* /*
Start of tes3mp addition Start of tes3mp addition
Send an ID_OBJECT_SOUND packet every time an actor makes a sound here Send an ID_OBJECT_SOUND packet every time the local player makes a sound here
*/ */
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
@ -81,13 +82,16 @@ void MWWorld::Action::execute (const Ptr& actor, bool noSound)
/* /*
Start of tes3mp addition Start of tes3mp addition
Send an ID_OBJECT_SOUND packet every time an actor makes a sound here Send an ID_OBJECT_SOUND packet every time a local actor makes a sound here
*/ */
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); if (mwmp::Main::get().getCellController()->isLocalActor(actor))
{
mwmp::ObjectList* objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectSound(local ? actor : mTarget, mSoundId, 1.0, 1.0); objectList->addObjectSound(local ? actor : mTarget, mSoundId, 1.0, 1.0);
objectList->sendObjectSound(); objectList->sendObjectSound();
}
/* /*
End of tes3mp addition End of tes3mp addition
*/ */
@ -101,13 +105,16 @@ void MWWorld::Action::execute (const Ptr& actor, bool noSound)
/* /*
Start of tes3mp addition Start of tes3mp addition
Send an ID_OBJECT_SOUND packet every time an actor makes a sound here Send an ID_OBJECT_SOUND packet every time a local actor makes a sound here
*/ */
mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); if (mwmp::Main::get().getCellController()->isLocalActor(actor))
{
mwmp::ObjectList* objectList = mwmp::Main::get().getNetworking()->getObjectList();
objectList->reset(); objectList->reset();
objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY; objectList->packetOrigin = mwmp::CLIENT_GAMEPLAY;
objectList->addObjectSound(local ? actor : mTarget, mSoundId, 1.0, 1.0); objectList->addObjectSound(local ? actor : mTarget, mSoundId, 1.0, 1.0);
objectList->sendObjectSound(); objectList->sendObjectSound();
}
/* /*
End of tes3mp addition End of tes3mp addition
*/ */