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

[Server] Change order of words in the names of script callbacks

Browse source
This commit is contained in:
David Cernat 2017-01-25 14:59:23 +02:00
parent 1d9c6ddd81
commit c62a575a9e
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/openmw-mp/Networking.cpp
View file

@ -161,7 +161,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
player->getCell()->getDescription().c_str()); player->getCell()->getDescription().c_str());
myPacket->Send(player, true); //send to other clients myPacket->Send(player, true); //send to other clients
Script::Call<Script::CallbackIdentity("OnPlayerChangeCell")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerCellChange")>(player->getId());
} }
else else
{ {
@ -188,7 +188,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
myPacket->Read(player); myPacket->Read(player);
myPacket->Send(player, true); myPacket->Send(player, true);
Script::Call<Script::CallbackIdentity("OnPlayerChangeAttributes")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerAttributesChange")>(player->getId());
} }
break; break;
@ -201,7 +201,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
myPacket->Read(player); myPacket->Read(player);
myPacket->Send(player, true); myPacket->Send(player, true);
Script::Call<Script::CallbackIdentity("OnPlayerChangeSkills")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerSkillsChange")>(player->getId());
} }
break; break;
@ -214,7 +214,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
myPacket->Read(player); myPacket->Read(player);
myPacket->Send(player, true); myPacket->Send(player, true);
Script::Call<Script::CallbackIdentity("OnPlayerChangeLevel")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerLevelChange")>(player->getId());
} }
break; break;
@ -226,7 +226,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
myPacket->Read(player); myPacket->Read(player);
myPacket->Send(player, true); myPacket->Send(player, true);
Script::Call<Script::CallbackIdentity("OnPlayerChangeEquipment")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerEquipmentChange")>(player->getId());
break; break;
} }
@ -236,7 +236,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
DEBUG_PRINTF("ID_GAME_INVENTORY\n"); DEBUG_PRINTF("ID_GAME_INVENTORY\n");
myPacket->Read(player); myPacket->Read(player);
Script::Call<Script::CallbackIdentity("OnPlayerChangeInventory")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerInventoryChange")>(player->getId());
break; break;
} }
@ -246,7 +246,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
DEBUG_PRINTF("ID_GAME_SPELLBOOK\n"); DEBUG_PRINTF("ID_GAME_SPELLBOOK\n");
myPacket->Read(player); myPacket->Read(player);
Script::Call<Script::CallbackIdentity("OnPlayerChangeSpellbook")>(player->getId(), player->spellbookChanges.action); Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player->getId(), player->spellbookChanges.action);
break; break;
} }
@ -256,7 +256,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
DEBUG_PRINTF("ID_GAME_JOURNAL\n"); DEBUG_PRINTF("ID_GAME_JOURNAL\n");
myPacket->Read(player); myPacket->Read(player);
Script::Call<Script::CallbackIdentity("OnPlayerChangeJournal")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerJournalChange")>(player->getId());
break; break;
} }

16
apps/openmw-mp/Script/ScriptFunctions.hpp
View file

@ -106,15 +106,15 @@ public:
{"OnPlayerDisconnect", Function<void, unsigned short>()}, {"OnPlayerDisconnect", Function<void, unsigned short>()},
{"OnPlayerDeath", Function<void, unsigned short, short, unsigned short>()}, {"OnPlayerDeath", Function<void, unsigned short, short, unsigned short>()},
{"OnPlayerResurrect", Function<void, unsigned short>()}, {"OnPlayerResurrect", Function<void, unsigned short>()},
{"OnPlayerChangeCell", Function<void, unsigned short>()}, {"OnPlayerCellChange", Function<void, unsigned short>()},
{"OnPlayerCellLoad", Function<void, unsigned short>()}, {"OnPlayerCellLoad", Function<void, unsigned short>()},
{"OnPlayerChangeAttributes", Function<void, unsigned short>()}, {"OnPlayerAttributesChange", Function<void, unsigned short>()},
{"OnPlayerChangeSkills", Function<void, unsigned short>()}, {"OnPlayerSkillsChange", Function<void, unsigned short>()},
{"OnPlayerChangeLevel", Function<void, unsigned short>()}, {"OnPlayerLevelChange", Function<void, unsigned short>()},
{"OnPlayerChangeEquipment", Function<void, unsigned short>()}, {"OnPlayerEquipmentChange", Function<void, unsigned short>()},
{"OnPlayerChangeInventory", Function<void, unsigned short>()}, {"OnPlayerInventoryChange", Function<void, unsigned short>()},
{"OnPlayerChangeSpellbook", Function<void, unsigned short, int>()}, {"OnPlayerSpellbookChange", Function<void, unsigned short, int>()},
{"OnPlayerChangeJournal", Function<void, unsigned short>()}, {"OnPlayerJournalChange", Function<void, unsigned short>()},
{"OnObjectPlace", Function<void, unsigned short, const char*, int, const char*>()}, {"OnObjectPlace", Function<void, unsigned short, const char*, int, const char*>()},
{"OnObjectDelete", 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*>()}, {"OnPlayerSendMessage", Function<bool, unsigned short, const char*>()},