mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:06:43 +00:00
Code Issues Releases Wiki Activity

[Server] use std::unique_ptr for packet controllers and MasterClient

Browse source
This commit is contained in:
Koncord 2018-02-16 12:14:51 +08:00
parent 2bfd4627ed
commit 44c549211e
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,9 +41,9 @@ Networking::Networking(RakNet::RakPeerInterface *peer) : mclient(nullptr)
sThis = this; sThis = this;
this->peer = peer; this->peer = peer;
playerPacketController = new PlayerPacketController(peer); playerPacketController = make_unique<PlayerPacketController>(peer);
actorPacketController = new ActorPacketController(peer); actorPacketController = make_unique<ActorPacketController>(peer);
worldPacketController = new WorldPacketController(peer); worldPacketController = make_unique<WorldPacketController>(peer);
// Set send stream // Set send stream
playerPacketController->SetStream(nullptr, &bsOut); playerPacketController->SetStream(nullptr, &bsOut);
@ -62,10 +62,6 @@ Networking::Networking(RakNet::RakPeerInterface *peer) : mclient(nullptr)
Networking::~Networking() Networking::~Networking()
{ {
luaState.getEventCtrl().Call<CoreEvent::ON_EXIT>(false); luaState.getEventCtrl().Call<CoreEvent::ON_EXIT>(false);
delete playerPacketController;
delete actorPacketController;
delete worldPacketController;
} }
void Networking::setServerPassword(std::string passw) noexcept void Networking::setServerPassword(std::string passw) noexcept
@ -334,17 +330,17 @@ void Networking::disconnectPlayer(RakNet::RakNetGUID guid)
PlayerPacketController *Networking::getPlayerPacketController() const PlayerPacketController *Networking::getPlayerPacketController() const
{ {
return playerPacketController; return playerPacketController.get();
} }
ActorPacketController *Networking::getActorPacketController() const ActorPacketController *Networking::getActorPacketController() const
{ {
return actorPacketController; return actorPacketController.get();
} }
WorldPacketController *Networking::getWorldPacketController() const WorldPacketController *Networking::getWorldPacketController() const
{ {
return worldPacketController; return worldPacketController.get();
} }
BaseActorList *Networking::getLastActorList() BaseActorList *Networking::getLastActorList()
@ -525,12 +521,12 @@ int Networking::getAvgPing(RakNet::AddressOrGUID addr) const
MasterClient *Networking::getMasterClient() MasterClient *Networking::getMasterClient()
{ {
return mclient; return mclient.get();
} }
void Networking::InitQuery(const std::string &queryAddr, unsigned short queryPort) void Networking::InitQuery(const std::string &queryAddr, unsigned short queryPort)
{ {
mclient = new MasterClient(peer, queryAddr, queryPort); mclient = make_unique<MasterClient>(peer, queryAddr, queryPort);
} }
void Networking::postInit() void Networking::postInit()

8
apps/openmw-mp/Networking.hpp
View file

@ -87,14 +87,14 @@ namespace mwmp
RakNet::RakPeerInterface *peer; RakNet::RakPeerInterface *peer;
RakNet::BitStream bsOut; RakNet::BitStream bsOut;
MasterClient *mclient; std::unique_ptr<MasterClient> mclient;
BaseActorList baseActorList; BaseActorList baseActorList;
BaseEvent baseEvent; BaseEvent baseEvent;
PlayerPacketController *playerPacketController; std::unique_ptr<PlayerPacketController> playerPacketController;
ActorPacketController *actorPacketController; std::unique_ptr<ActorPacketController> actorPacketController;
WorldPacketController *worldPacketController; std::unique_ptr<WorldPacketController> worldPacketController;
bool running; bool running;
int exitCode; int exitCode;