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

[Server] Move setPlayer() to PlayerProcessor

Browse source
This commit is contained in:
Koncord 2017-04-03 06:05:18 +08:00
parent 0317e2523b
commit ead92fff61
20 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ bool PlayerProcessor::Process(RakNet::Packet &packet) noexcept
{
Player *player = Players::getPlayer(packet.guid);
PlayerPacket *myPacket = Networking::get().getPlayerController()->GetPacket(packet.data[0]);
myPacket->setPlayer(player);
processor.second->Do(*myPacket, *player);
return true;

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

@ -22,7 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.setPlayer(&player);
packet.Read();
Script::CallBackReturn<Script::CallbackIdentity("OnPlayerSendMessage")> result = true;
Script::Call<Script::CallbackIdentity("OnPlayerSendMessage")>(result, player.getId(), player.chatMessage.c_str());
@ -31,8 +30,6 @@ namespace mwmp
{
player.chatMessage = player.npc.mName + " (" + std::to_string(player.getId()) + "): "
+ player.chatMessage + "\n";
packet.setPlayer(&player);
packet.Send(false);
packet.Send(true);
}

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

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

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

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

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

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

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

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

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

@ -28,7 +28,6 @@ namespace mwmp
if (!player.creatureStats.mDead)
{
packet.setPlayer(&player);
packet.Read();
LOG_APPEND(Log::LOG_INFO, "- Moved to %s", player.cell.getDescription().c_str());

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

@ -27,7 +27,6 @@ namespace mwmp
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID, player.npc.mName.c_str());
packet.setPlayer(&player);
packet.Read();
CellController::get()->update(&player);

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

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

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

@ -22,7 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.setPlayer(&player);
packet.Read();
if (player.charGenStage.current == player.charGenStage.end && player.charGenStage.current != 0)

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

@ -41,7 +41,6 @@ namespace mwmp
player.creatureStats.mDead = true;
packet.setPlayer(&player);
packet.Send(true);
Script::Call<Script::CallbackIdentity("OnPlayerDeath")>(player.getId(), reason, killer->getId());

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

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

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

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

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

@ -22,7 +22,6 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
packet.setPlayer(&player);
packet.Read();
//myPacket->Send(player, true);

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

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

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

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

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

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

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

@ -24,7 +24,6 @@ namespace mwmp
player.creatureStats.mDead = false;
packet.setPlayer(&player);
packet.Send(true);
Script::Call<Script::CallbackIdentity("OnPlayerResurrect")>(player.getId());

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

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

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

@ -20,8 +20,7 @@ namespace mwmp
void Do(PlayerPacket &packet, Player &player) override
{
DEBUG_PRINTF(strPacketID.c_str());
packet.setPlayer(&player);
packet.Read();
Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player.getId());