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

[Server] Move packet.Read() to parent

Browse source
This commit is contained in:
Koncord 2017-04-03 06:13:56 +08:00
parent 4daf471874
commit 47924f5bb0
21 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw-mp/PlayerProcessor.cpp
View file

@ -32,6 +32,9 @@ bool PlayerProcessor::Process(RakNet::Packet &packet) noexcept
PlayerPacket *myPacket = Networking::get().getPlayerController()->GetPacket(packet.data[0]);
myPacket->setPlayer(player);
if(!processor.second->dontRead)
myPacket->Read();
processor.second->Do(*myPacket, *player);
return true;
}

3
apps/openmw-mp/WorldProcessor.cpp
View file

@ -41,7 +41,8 @@ bool WorldProcessor::Process(RakNet::Packet &packet) noexcept
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s from %s", processor.second->strPacketID.c_str(),
player->npc.mName.c_str());
myPacket->setEvent(&baseEvent);
myPacket->Read();
if(!processor.second->dontRead)
myPacket->Read();
processor.second->Do(*myPacket, *player, baseEvent);
return true;
}

1
apps/openmw-mp/processors/player/ProcessorChatMsg.hpp
View file

@ -22,7 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
Script::CallBackReturn<Script::CallbackIdentity("OnPlayerSendMessage")> result = true;
Script::Call<Script::CallbackIdentity("OnPlayerSendMessage")>(result, player.getId(), player.chatMessage.c_str());

2
apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp
View file

@ -22,8 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
Script::Call<Script::CallbackIdentity("OnGUIAction")>(player.getId(), (int)player.guiMessageBox.id,
player.guiMessageBox.data.c_str());
}

3
apps/openmw-mp/processors/player/ProcessorLevel.hpp
View file

@ -22,9 +22,6 @@ namespace mwmp
{
if (!player.creatureStats.mDead)
{
packet.Read();
//packet.Send(&player, true);
Script::Call<Script::CallbackIdentity("OnPlayerLevelChange")>(player.getId());
}
}

2
apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp
View file

@ -26,8 +26,6 @@ namespace mwmp
if (!player.creatureStats.mDead)
{
packet.Read();
Player *target = Players::getPlayer(player.attack.target);
if (target == nullptr)

1
apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp
View file

@ -22,7 +22,6 @@ namespace mwmp
{
if (!player.creatureStats.mDead)
{
packet.Read();
//myPacket->Send(player, true);
player.sendToLoaded(&packet);

2
apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
View file

@ -28,8 +28,6 @@ namespace mwmp
if (!player.creatureStats.mDead)
{
packet.Read();
LOG_APPEND(Log::LOG_INFO, "- Moved to %s", player.cell.getDescription().c_str());
player.forEachLoaded([this](Player *pl, Player *other) {

2
apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp
View file

@ -27,8 +27,6 @@ namespace mwmp
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID, player.npc.mName.c_str());
packet.Read();
CellController::get()->update(&player);
Script::Call<Script::CallbackIdentity("OnPlayerCellState")>(player.getId());

2
apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp
View file

@ -21,8 +21,6 @@ namespace mwmp
void Do(PlayerPacket &packet, Player &player) override
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
}
};
}

2
apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
View file

@ -22,8 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
if (player.charGenStage.current == player.charGenStage.end && player.charGenStage.current != 0)
Script::Call<Script::CallbackIdentity("OnPlayerEndCharGen")>(player.getId());
}

1
apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp
View file

@ -17,6 +17,7 @@ namespace mwmp
ProcessorPlayerDeath()
{
BPP_INIT(ID_PLAYER_DEATH)
dontRead = true;
}
void Do(PlayerPacket &packet, Player &player) override

3
apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp
View file

@ -22,9 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
//packet.Send(&player, true);
player.sendToLoaded(&packet);
}
};

2
apps/openmw-mp/processors/player/ProcessorPlayerDynamicStats.hpp
View file

@ -22,8 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
player.sendToLoaded(&packet);
}
};

3
apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp
View file

@ -22,9 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
//myPacket->Send(player, true);
player.sendToLoaded(&packet);
Script::Call<Script::CallbackIdentity("OnPlayerEquipmentChange")>(player.getId());

2
apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp
View file

@ -21,8 +21,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
Script::Call<Script::CallbackIdentity("OnPlayerInventoryChange")>(player.getId());
}
};

2
apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp
View file

@ -22,8 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
Script::Call<Script::CallbackIdentity("OnPlayerJournalChange")>(player.getId());
}
};

3
apps/openmw-mp/processors/player/ProcessorPlayerPos.hpp
View file

@ -22,9 +22,6 @@ namespace mwmp
//DEBUG_PRINTF(strPacketID);
if (!player.creatureStats.mDead)
{
packet.Read();
//myPacket.Send(player, true); //send to other clients
player.sendToLoaded(&packet);
}
}

1
apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp
View file

@ -16,6 +16,7 @@ namespace mwmp
ProcessorPlayerResurrect()
{
BPP_INIT(ID_PLAYER_RESURRECT)
dontRead = true;
}
void Do(PlayerPacket &packet, Player &player) override

1
apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp
View file

@ -21,7 +21,6 @@ namespace mwmp
{
if (!player.creatureStats.mDead)
{
packet.Read();
//myPacket->Send(player, true);
player.sendToLoaded(&packet);

2
apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp
View file

@ -21,8 +21,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.Read();
Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player.getId());
}
};