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

Send ID_WORLD_OBJECT_UNLOCK from ingame scripts and regular unlocking

Browse source
This commit is contained in:
David Cernat 2016-10-24 11:43:27 +03:00
parent 08ea5163c4
commit 3a5a5e73a1
3 changed files with 20 additions and 0 deletions
apps/openmw
mwmechanics
security.cpp
mwscript
miscextensions.cpp
mwworld
actiontake.cpp

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

@ -1,5 +1,10 @@
#include "security.hpp"
#include <components/openmw-mp/Base/WorldEvent.hpp>
#include "../mwmp/Main.hpp"
#include "../mwworld/cellstore.hpp"
#include <components/misc/rng.hpp>
#include "../mwworld/class.hpp"
@ -52,6 +57,13 @@ namespace MWMechanics
MWBase::Environment::get().getMechanicsManager()->objectOpened(mActor, lock);
if (Misc::Rng::roll0to99() <= x)
{
// Added by tes3mp
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cell = *lock.getCell()->getCell();
event->cellRef.mRefID = lock.getCellRef().getRefId();
event->cellRef.mRefNum = lock.getCellRef().getRefNum();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_WORLD_OBJECT_UNLOCK)->Send(event);
lock.getClass().unlock(lock);
resultMessage = "#{sLockSuccess}";
resultSound = "Open Lock";

7
apps/openmw/mwscript/miscextensions.cpp
View file

@ -212,6 +212,13 @@ namespace MWScript
{
MWWorld::Ptr ptr = R()(runtime);
// Added by tes3mp
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cell = *ptr.getCell()->getCell();
event->cellRef.mRefID = ptr.getCellRef().getRefId();
event->cellRef.mRefNum = ptr.getCellRef().getRefNum();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_WORLD_OBJECT_UNLOCK)->Send(event);
ptr.getClass().unlock (ptr);
}
};

1
apps/openmw/mwworld/actiontake.cpp
View file

@ -2,6 +2,7 @@
#include <components/openmw-mp/Base/WorldEvent.hpp>
#include "../mwmp/Main.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwbase/environment.hpp"