mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-06-20 23:44:08 +00:00
Use std::unique_ptr for stats-table
This commit is contained in:
@@ -42,8 +42,6 @@ CNetClientSession::CNetClientSession(CNetClient& client) :
|
||||
CNetClientSession::~CNetClientSession()
|
||||
{
|
||||
ENSURE(!m_LoopRunning);
|
||||
|
||||
delete m_Stats;
|
||||
}
|
||||
|
||||
bool CNetClientSession::Connect(const CStr& server, const u16 port, ENetHost* enetClient)
|
||||
@@ -70,9 +68,9 @@ bool CNetClientSession::Connect(const CStr& server, const u16 port, ENetHost* en
|
||||
return false;
|
||||
|
||||
|
||||
m_Stats = new CNetStatsTable(*m_Server);
|
||||
m_Stats = std::make_unique<CNetStatsTable>(*m_Server);
|
||||
if (CProfileViewer::IsInitialised())
|
||||
g_ProfileViewer.AddRootTable(m_Stats);
|
||||
g_ProfileViewer.AddRootTable(m_Stats.get());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ private:
|
||||
|
||||
std::unique_ptr<ENetHost, DestroyHost> m_Host;
|
||||
std::unique_ptr<ENetPeer, DestroyPeer> m_Server;
|
||||
CNetStatsTable* m_Stats{nullptr};
|
||||
std::unique_ptr<CNetStatsTable> m_Stats;
|
||||
};
|
||||
|
||||
#endif // NETSESSION_H
|
||||
|
||||
@@ -132,9 +132,9 @@ CNetServerWorker::CNetServerWorker(const bool continueSavedGame, std::uint16_t p
|
||||
throw std::runtime_error{"Failed to start server"};
|
||||
}
|
||||
|
||||
m_Stats = new CNetStatsTable();
|
||||
m_Stats = std::make_unique<CNetStatsTable>();
|
||||
if (CProfileViewer::IsInitialised())
|
||||
g_ProfileViewer.AddRootTable(m_Stats);
|
||||
g_ProfileViewer.AddRootTable(m_Stats.get());
|
||||
|
||||
m_State = SERVER_STATE_PREGAME;
|
||||
|
||||
@@ -165,9 +165,6 @@ CNetServerWorker::~CNetServerWorker()
|
||||
#endif
|
||||
|
||||
// Clean up resources
|
||||
|
||||
delete m_Stats;
|
||||
|
||||
for (const auto& session : m_Sessions)
|
||||
session->DisconnectNow(NDR_SERVER_SHUTDOWN);
|
||||
}
|
||||
|
||||
@@ -266,7 +266,7 @@ private:
|
||||
std::unique_ptr<ENetHost, DestroyHost> m_Host;
|
||||
std::vector<std::unique_ptr<CNetServerSession>> m_Sessions;
|
||||
|
||||
CNetStatsTable* m_Stats{nullptr};
|
||||
std::unique_ptr<CNetStatsTable> m_Stats;
|
||||
|
||||
NetServerState m_State{SERVER_STATE_PREGAME};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user