edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2184

Browse source 
2184: Don't Destroy if we didn't Init r=heinrich5991 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2020-05-16 20:14:38 +00:00 committed by GitHub
parent 898b4ce4b9 1426392ae7
commit e8a59482c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/server/antibot.cpp
View file

@ -7,7 +7,7 @@
#ifdef CONF_ANTIBOT #ifdef CONF_ANTIBOT
CAntibot::CAntibot() CAntibot::CAntibot()
: m_pGameServer(0) : m_pServer(0), m_pConsole(0), m_pGameServer(0), m_Initialized(false)
{ {
} }
CAntibot::~CAntibot() CAntibot::~CAntibot()
@ -15,6 +15,7 @@ CAntibot::~CAntibot()
if(m_pGameServer && m_RoundData.m_Map.m_pTiles) if(m_pGameServer && m_RoundData.m_Map.m_pTiles)
free(m_RoundData.m_Map.m_pTiles); free(m_RoundData.m_Map.m_pTiles);
if(m_Initialized)
AntibotDestroy(); AntibotDestroy();
} }
void CAntibot::Send(int ClientID, const void *pData, int Size, int Flags, void *pUser) void CAntibot::Send(int ClientID, const void *pData, int Size, int Flags, void *pUser)
@ -61,6 +62,8 @@ void CAntibot::Init()
m_Data.m_pfnSend = Send; m_Data.m_pfnSend = Send;
m_Data.m_pUser = this; m_Data.m_pUser = this;
AntibotInit(&m_Data); AntibotInit(&m_Data);
m_Initialized = true;
} }
void CAntibot::RoundStart(IGameServer *pGameServer) void CAntibot::RoundStart(IGameServer *pGameServer)
{ {
@ -112,8 +115,8 @@ void CAntibot::OnEngineClientMessage(int ClientID, const void *pData, int Size,
AntibotOnEngineClientMessage(ClientID, pData, Size, Flags); AntibotOnEngineClientMessage(ClientID, pData, Size, Flags);
} }
#else #else
CAntibot::CAntibot() : CAntibot::CAntibot()
m_pGameServer(0) : m_pServer(0), m_pConsole(0), m_pGameServer(0), m_Initialized(false)
{ {
} }
CAntibot::~CAntibot() CAntibot::~CAntibot()

1
src/engine/server/antibot.h
View file

@ -16,6 +16,7 @@ class CAntibot : public IEngineAntibot
CAntibotData m_Data; CAntibotData m_Data;
CAntibotRoundData m_RoundData; CAntibotRoundData m_RoundData;
bool m_Initialized;
void Update(); void Update();
static void Send(int ClientID, const void *pData, int Size, int Flags, void *pUser); static void Send(int ClientID, const void *pData, int Size, int Flags, void *pUser);