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

[Server] Add PreReading virtual method

Browse source 
add "const" qualifier to exteriorCellPattern
This commit is contained in:
Koncord 2018-03-05 15:15:39 +08:00
parent d0eef7c98e
commit afbafdf806
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@ const vector<string> Utils::split(const string &str, int delimiter)
vector<string> result; vector<string> result;
for (const auto &symb : str) for (const auto &symb : str)
{
if (symb != delimiter) if (symb != delimiter)
buffer += symb; buffer += symb;
else if (!buffer.empty()) else if (!buffer.empty())
@ -21,6 +22,7 @@ const vector<string> Utils::split(const string &str, int delimiter)
result.push_back(move(buffer)); result.push_back(move(buffer));
buffer.clear(); buffer.clear();
} }
}
if (!buffer.empty()) if (!buffer.empty())
result.push_back(move(buffer)); result.push_back(move(buffer));
@ -32,7 +34,7 @@ ESM::Cell Utils::getCellFromDescription(const std::string &cellDescription)
ESM::Cell cell; ESM::Cell cell;
cell.blank(); cell.blank();
static regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$"); static const regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$");
smatch baseMatch; smatch baseMatch;
if (regex_match(cellDescription, baseMatch, exteriorCellPattern)) if (regex_match(cellDescription, baseMatch, exteriorCellPattern))

7
apps/openmw-mp/processors/PlayerProcessor.cpp
View file

@ -20,10 +20,15 @@ bool PlayerProcessor::Process(RakNet::Packet &packet) noexcept
PlayerPacket *myPacket = Networking::get().getPlayerPacketController()->GetPacket(packet.data[0]); PlayerPacket *myPacket = Networking::get().getPlayerPacketController()->GetPacket(packet.data[0]);
myPacket->setPlayer(player.get()); myPacket->setPlayer(player.get());
LOG_MESSAGE_SIMPLE(Log::LOG_TRACE, "Processing %s from %s", processor.second->strPacketID.c_str(), player->npc.mName.c_str());
LOG_MESSAGE_SIMPLE(Log::LOG_TRACE, "Processing %s from %s", processor.second->strPacketID.c_str(),
player->npc.mName.c_str());
if (!processor.second->avoidReading) if (!processor.second->avoidReading)
{
processor.second->PreReading(*myPacket, player);
myPacket->Read(); myPacket->Read();
}
processor.second->Do(*myPacket, player); processor.second->Do(*myPacket, player);
return true; return true;

1
apps/openmw-mp/processors/PlayerProcessor.hpp
View file

@ -18,6 +18,7 @@ namespace mwmp
{ {
public: public:
virtual void PreReading(PlayerPacket &packet, const std::shared_ptr<Player> &player){};
virtual void Do(PlayerPacket &packet, const std::shared_ptr<Player> &player) = 0; virtual void Do(PlayerPacket &packet, const std::shared_ptr<Player> &player) = 0;
static bool Process(RakNet::Packet &packet) noexcept; static bool Process(RakNet::Packet &packet) noexcept;