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

[Server] Rename dontRead to avoidReading

Browse source
This commit is contained in:
Koncord 2017-04-03 06:44:14 +08:00
parent 47924f5bb0
commit 1d2a6d9056
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -41,8 +41,10 @@ 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);
if(!processor.second->dontRead)
if(!processor.second->avoidReading)
myPacket->Read();
processor.second->Do(*myPacket, *player, baseEvent);
return true;
}

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

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

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

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

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

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

4
components/openmw-mp/Base/BasePacketProcessor.hpp
View file

@ -7,7 +7,7 @@
#include <string>
#define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); dontRead = false;
#define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); avoidReading = false;
class BasePacketProcessor
{
@ -30,7 +30,7 @@ protected:
unsigned char packetID;
std::string strPacketID;
std::string className;
bool dontRead;
bool avoidReading;
};