From 93aa674effc7eec7d677af5bb9e7b2e2b36ca4c2 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Fri, 26 May 2017 00:42:46 +0300 Subject: [PATCH] [Server] Add SendObjectTrap() script function --- apps/openmw-mp/Script/Functions/World.cpp | 18 ++++++++++++------ apps/openmw-mp/Script/Functions/World.hpp | 6 ++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/apps/openmw-mp/Script/Functions/World.cpp b/apps/openmw-mp/Script/Functions/World.cpp index e4813e0ea..c534c4ad5 100644 --- a/apps/openmw-mp/Script/Functions/World.cpp +++ b/apps/openmw-mp/Script/Functions/World.cpp @@ -263,18 +263,24 @@ void WorldFunctions::SendObjectPlace() noexcept mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_PLACE)->Send(writeEvent.guid); } -void WorldFunctions::SendObjectScale() noexcept -{ - mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_SCALE)->setEvent(&writeEvent); - mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_SCALE)->Send(writeEvent.guid); -} - void WorldFunctions::SendObjectLock() noexcept { mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_LOCK)->setEvent(&writeEvent); mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_LOCK)->Send(writeEvent.guid); } +void WorldFunctions::SendObjectTrap() noexcept +{ + mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_TRAP)->setEvent(&writeEvent); + mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_TRAP)->Send(writeEvent.guid); +} + +void WorldFunctions::SendObjectScale() noexcept +{ + mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_SCALE)->setEvent(&writeEvent); + mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_OBJECT_SCALE)->Send(writeEvent.guid); +} + void WorldFunctions::SendDoorState() noexcept { mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_DOOR_STATE)->setEvent(&writeEvent); diff --git a/apps/openmw-mp/Script/Functions/World.hpp b/apps/openmw-mp/Script/Functions/World.hpp index 05adf1c8d..f9ef35a71 100644 --- a/apps/openmw-mp/Script/Functions/World.hpp +++ b/apps/openmw-mp/Script/Functions/World.hpp @@ -55,8 +55,9 @@ \ {"SendObjectDelete", WorldFunctions::SendObjectDelete},\ {"SendObjectPlace", WorldFunctions::SendObjectPlace},\ - {"SendObjectScale", WorldFunctions::SendObjectScale},\ {"SendObjectLock", WorldFunctions::SendObjectLock},\ + {"SendObjectTrap", WorldFunctions::SendObjectTrap},\ + {"SendObjectScale", WorldFunctions::SendObjectScale},\ {"SendDoorState", WorldFunctions::SendDoorState},\ {"SendContainer", WorldFunctions::SendContainer},\ \ @@ -121,8 +122,9 @@ public: static void SendObjectDelete() noexcept; static void SendObjectPlace() noexcept; - static void SendObjectScale() noexcept; static void SendObjectLock() noexcept; + static void SendObjectTrap() noexcept; + static void SendObjectScale() noexcept; static void SendDoorState() noexcept; static void SendContainer() noexcept;