mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 22:09:39 +00:00
Code Issues Releases Wiki Activity

[Client] Send ObjectTrap packets when disarming traps with keys & probes

Browse source
This commit is contained in:
David Cernat 2017-05-26 01:47:59 +03:00
parent 32879adc5b
commit 20a72ec807
3 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwclass/container.cpp
View file

@ -185,6 +185,19 @@ namespace MWClass
"Disarm Trap", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, "Disarm Trap", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Normal); MWBase::SoundManager::Play_Normal);
isTrapped = false; isTrapped = false;
/*
Start of tes3mp addition
Send an ID_OBJECT_TRAP packet every time a trap is disarmed
*/
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset();
worldEvent->addObjectTrap(ptr, ptr.getRefData().getPosition(), true);
worldEvent->sendObjectTrap();
/*
End of tes3mp addition
*/
} }
/* /*

13
apps/openmw/mwclass/door.cpp
View file

@ -170,6 +170,19 @@ namespace MWClass
"Disarm Trap", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, "Disarm Trap", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Normal); MWBase::SoundManager::Play_Normal);
isTrapped = false; isTrapped = false;
/*
Start of tes3mp addition
Send an ID_OBJECT_TRAP packet every time a trap is disarmed
*/
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset();
worldEvent->addObjectTrap(ptr, ptr.getRefData().getPosition(), true);
worldEvent->sendObjectTrap();
/*
End of tes3mp addition
*/
} }
/* /*

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

@ -126,6 +126,19 @@ namespace MWMechanics
resultSound = "Disarm Trap"; resultSound = "Disarm Trap";
resultMessage = "#{sTrapSuccess}"; resultMessage = "#{sTrapSuccess}";
mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, 0); mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, 0);
/*
Start of tes3mp addition
Send an ID_OBJECT_TRAP packet every time a trap is disarmed
*/
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset();
worldEvent->addObjectTrap(trap, trap.getRefData().getPosition(), true);
worldEvent->sendObjectTrap();
/*
End of tes3mp addition
*/
} }
else else
resultMessage = "#{sTrapFail}"; resultMessage = "#{sTrapFail}";