From 5989bbd97ea8680e01f76c2afc2966dd17bdd1e4 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 29 Jan 2017 12:56:11 +0200
Subject: [PATCH] [Server] Remove arguments from OnObjectPlace & OnObjectDelete
 callbacks

---
 apps/openmw-mp/Networking.cpp             | 12 ++----------
 apps/openmw-mp/Script/ScriptFunctions.hpp |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index bbc796613..2246534f1 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -435,11 +435,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
         {
             worldObject = worldEvent->objectChanges.objects[i];
 
-            Script::Call<Script::CallbackIdentity("OnObjectPlace")>(
-                player->getId(),
-                worldObject.refId.c_str(),
-                (int)worldObject.refNumIndex,
-                worldEvent->cell.getDescription().c_str());
+            Script::Call<Script::CallbackIdentity("OnObjectPlace")>(player->getId());
         }
 
         break;
@@ -459,11 +455,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
         {
             worldObject = worldEvent->objectChanges.objects[i];
 
-            Script::Call<Script::CallbackIdentity("OnObjectDelete")>(
-                player->getId(),
-                worldObject.refId.c_str(),
-                (int)worldObject.refNumIndex,
-                worldEvent->cell.getDescription().c_str());
+            Script::Call<Script::CallbackIdentity("OnObjectDelete")>(player->getId());
         }
 
         break;
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index 511a1b079..9355945e7 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -117,8 +117,8 @@ public:
             {"OnPlayerInventoryChange",  Function<void, unsigned short>()},
             {"OnPlayerSpellbookChange",  Function<void, unsigned short, int>()},
             {"OnPlayerJournalChange",    Function<void, unsigned short>()},
-            {"OnObjectPlace",            Function<void, unsigned short, const char*, int, const char*>()},
-            {"OnObjectDelete",           Function<void, unsigned short, const char*, int, const char*>()},
+            {"OnObjectPlace",            Function<void, unsigned short>()},
+            {"OnObjectDelete",           Function<void, unsigned short>()},
             {"OnPlayerSendMessage",      Function<bool, unsigned short, const char*>()},
             {"OnPlayerEndCharGen",       Function<void, unsigned short>()},
             {"OnGUIAction",              Function<void, unsigned short, int, const char*>()}