krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
coverity_scan^2
David Cernat 8 years ago
parent 1d9c6ddd81
commit c62a575a9e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

16
apps/openmw-mp/Networking.cpp
Unescape Escape View File

@ -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;
}

16
apps/openmw-mp/Script/ScriptFunctions.hpp
Unescape Escape View File

@ -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*>()},

Write Preview
Loading…
Cancel
Save