mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 21:45:33 +00:00
Code Issues Releases Wiki Activity

[General] Stop using virtual functions in BasePlayer, part 2

Browse source
This commit is contained in:
David Cernat 2017-01-25 17:19:53 +02:00
parent 63c8a98083
commit 73d39c1a0a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,12 +70,12 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
return; return;
} }
if (*player->getPassw() != passw) if (player->passw != passw)
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Wrong server password for player %d, name: %s (pass: %s)", LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Wrong server password for player %d, name: %s (pass: %s)",
player->getId(), player->getId(),
player->npc.mName.c_str(), player->npc.mName.c_str(),
player->getPassw()->c_str()); player->passw.c_str());
kickPlayer(player->guid); kickPlayer(player->guid);
return; return;
} }
@ -158,7 +158,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
myPacket->Read(player); myPacket->Read(player);
LOG_APPEND(Log::LOG_INFO, "- Moved to %s", LOG_APPEND(Log::LOG_INFO, "- Moved to %s",
player->getCell()->getDescription().c_str()); player->cell.getDescription().c_str());
myPacket->Send(player, true); //send to other clients myPacket->Send(player, true); //send to other clients
Script::Call<Script::CallbackIdentity("OnPlayerCellChange")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerCellChange")>(player->getId());
@ -275,7 +275,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
target = player; target = player;
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Player: %s attacked %s state: %d", player->npc.mName.c_str(), LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Player: %s attacked %s state: %d", player->npc.mName.c_str(),
target->Npc()->mName.c_str(), player->attack.pressed == 1); target->npc.mName.c_str(), player->attack.pressed == 1);
if (player->attack.pressed == 0) if (player->attack.pressed == 0)
{ {
LOG_APPEND(Log::LOG_VERBOSE, "success: %d", player->attack.success == 1); LOG_APPEND(Log::LOG_VERBOSE, "success: %d", player->attack.success == 1);
@ -357,7 +357,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
DEBUG_PRINTF("ID_CHAT_MESSAGE\n"); DEBUG_PRINTF("ID_CHAT_MESSAGE\n");
myPacket->Read(player); myPacket->Read(player);
Script::CallBackReturn<Script::CallbackIdentity("OnPlayerSendMessage")> result = true; Script::CallBackReturn<Script::CallbackIdentity("OnPlayerSendMessage")> result = true;
Script::Call<Script::CallbackIdentity("OnPlayerSendMessage")>(result, player->getId(), player->ChatMessage()->c_str()); Script::Call<Script::CallbackIdentity("OnPlayerSendMessage")>(result, player->getId(), player->chatMessage.c_str());
if (result) if (result)
{ {

2
apps/openmw-mp/Script/Functions/Chat.cpp
View file

@ -11,7 +11,7 @@ void ScriptFunctions::SendMessage(unsigned short pid, const char *message, bool
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
*player->ChatMessage() = message; player->chatMessage = message;
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "System: %s", message); LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "System: %s", message);