From 1198caddf66f588db1d29f381b6c8c2b3c646f37 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Thu, 16 Feb 2017 18:33:54 +0200
Subject: [PATCH] [Server] Add OnContainer script callback

---
 apps/openmw-mp/Networking.cpp             | 26 +++++++++++++----------
 apps/openmw-mp/Script/ScriptFunctions.hpp |  1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index bf7c3888d..917eac56c 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -537,17 +537,6 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
         break;
     }
 
-    case ID_CONTAINER:
-    {
-        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONTAINER from %s",
-            player->npc.mName.c_str());
-
-        myPacket->Read(baseEvent);
-        myPacket->Send(baseEvent, true);
-
-        break;
-    }
-
     case ID_OBJECT_HEALTH:
     {
         LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_HEALTH from %s",
@@ -574,6 +563,21 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
         break;
     }
 
+    case ID_CONTAINER:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONTAINER from %s",
+            player->npc.mName.c_str());
+
+        myPacket->Read(baseEvent);
+        myPacket->Send(baseEvent, true);
+
+        Script::Call<Script::CallbackIdentity("OnContainer")>(
+            player->getId(),
+            baseEvent->cell.getDescription().c_str());
+
+        break;
+    }
+
     case ID_SCRIPT_LOCAL_SHORT:
     {
         LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_SCRIPT_LOCAL_SHORT from %s",
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index 3960c7971..2233f6c99 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -123,6 +123,7 @@ public:
             {"OnObjectLock",             Function<void, unsigned short, const char*>()},
             {"OnObjectUnlock",           Function<void, unsigned short, const char*>()},
             {"OnDoorState",              Function<void, unsigned short, const char*>()},
+            {"OnContainer",              Function<void, unsigned short, const char*>()},
             {"OnPlayerSendMessage",      Function<bool, unsigned short, const char*>()},
             {"OnPlayerEndCharGen",       Function<void, unsigned short>()},
             {"OnGUIAction",              Function<void, unsigned short, int, const char*>()}