From c62a575a9e4ed183a16d39222536568dc544d91f Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Wed, 25 Jan 2017 14:59:23 +0200
Subject: [PATCH] [Server] Change order of words in the names of script
 callbacks

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

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index e122a4b8a..c7af57942 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -161,7 +161,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
                 player->getCell()->getDescription().c_str());
 
             myPacket->Send(player, true); //send to other clients
-            Script::Call<Script::CallbackIdentity("OnPlayerChangeCell")>(player->getId());
+            Script::Call<Script::CallbackIdentity("OnPlayerCellChange")>(player->getId());
         }
         else
         {
@@ -188,7 +188,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
             myPacket->Read(player);
             myPacket->Send(player, true);
 
-            Script::Call<Script::CallbackIdentity("OnPlayerChangeAttributes")>(player->getId());
+            Script::Call<Script::CallbackIdentity("OnPlayerAttributesChange")>(player->getId());
         }
 
         break;
@@ -201,7 +201,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
             myPacket->Read(player);
             myPacket->Send(player, true);
 
-            Script::Call<Script::CallbackIdentity("OnPlayerChangeSkills")>(player->getId());
+            Script::Call<Script::CallbackIdentity("OnPlayerSkillsChange")>(player->getId());
         }
 
         break;
@@ -214,7 +214,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
             myPacket->Read(player);
             myPacket->Send(player, true);
 
-            Script::Call<Script::CallbackIdentity("OnPlayerChangeLevel")>(player->getId());
+            Script::Call<Script::CallbackIdentity("OnPlayerLevelChange")>(player->getId());
         }
 
         break;
@@ -226,7 +226,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
         myPacket->Read(player);
         myPacket->Send(player, true);
 
-        Script::Call<Script::CallbackIdentity("OnPlayerChangeEquipment")>(player->getId());
+        Script::Call<Script::CallbackIdentity("OnPlayerEquipmentChange")>(player->getId());
 
         break;
     }
@@ -236,7 +236,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
         DEBUG_PRINTF("ID_GAME_INVENTORY\n");
         myPacket->Read(player);
 
-        Script::Call<Script::CallbackIdentity("OnPlayerChangeInventory")>(player->getId());
+        Script::Call<Script::CallbackIdentity("OnPlayerInventoryChange")>(player->getId());
 
         break;
     }
@@ -246,7 +246,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
         DEBUG_PRINTF("ID_GAME_SPELLBOOK\n");
         myPacket->Read(player);
 
-        Script::Call<Script::CallbackIdentity("OnPlayerChangeSpellbook")>(player->getId(), player->spellbookChanges.action);
+        Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player->getId(), player->spellbookChanges.action);
 
         break;
     }
@@ -256,7 +256,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
         DEBUG_PRINTF("ID_GAME_JOURNAL\n");
         myPacket->Read(player);
 
-        Script::Call<Script::CallbackIdentity("OnPlayerChangeJournal")>(player->getId());
+        Script::Call<Script::CallbackIdentity("OnPlayerJournalChange")>(player->getId());
 
         break;
     }
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index 1b85a79db..2e726ecfd 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -106,15 +106,15 @@ public:
             {"OnPlayerDisconnect",       Function<void, unsigned short>()},
             {"OnPlayerDeath",            Function<void, unsigned short, short, unsigned short>()},
             {"OnPlayerResurrect",        Function<void, unsigned short>()},
-            {"OnPlayerChangeCell",       Function<void, unsigned short>()},
+            {"OnPlayerCellChange",       Function<void, unsigned short>()},
             {"OnPlayerCellLoad",         Function<void, unsigned short>()},
-            {"OnPlayerChangeAttributes", Function<void, unsigned short>()},
-            {"OnPlayerChangeSkills",     Function<void, unsigned short>()},
-            {"OnPlayerChangeLevel",      Function<void, unsigned short>()},
-            {"OnPlayerChangeEquipment",  Function<void, unsigned short>()},
-            {"OnPlayerChangeInventory",  Function<void, unsigned short>()},
-            {"OnPlayerChangeSpellbook",  Function<void, unsigned short, int>()},
-            {"OnPlayerChangeJournal",    Function<void, unsigned short>()},
+            {"OnPlayerAttributesChange", Function<void, unsigned short>()},
+            {"OnPlayerSkillsChange",     Function<void, unsigned short>()},
+            {"OnPlayerLevelChange",      Function<void, unsigned short>()},
+            {"OnPlayerEquipmentChange",  Function<void, unsigned short>()},
+            {"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*>()},
             {"OnPlayerSendMessage",      Function<bool, unsigned short, const char*>()},