mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15262) -Fix: AIEvents were not freed, when they were not queued for any AI.

release/0.7
frosch 2009-01-24 21:38:30 +00:00
parent e8b5f49861
commit 80ee3d3440
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ai/ai_core.cpp
View File

@ -160,28 +160,47 @@
/* static */ void AI::NewEvent(CompanyID company, AIEvent *event) /* static */ void AI::NewEvent(CompanyID company, AIEvent *event)
{ {
/* AddRef() and Release() need to be called at least once, so do it here */
event->AddRef();
/* Clients should ignore events */ /* Clients should ignore events */
if (_networking && !_network_server) return; if (_networking && !_network_server) {
event->Release();
return;
}
/* Only AIs can have an event-queue */ /* Only AIs can have an event-queue */
if (!IsValidCompanyID(company) || IsHumanCompany(company)) return; if (!IsValidCompanyID(company) || IsHumanCompany(company)) {
event->Release();
return;
}
/* Queue the event */ /* Queue the event */
CompanyID old_company = _current_company; CompanyID old_company = _current_company;
_current_company = company; _current_company = company;
AIEventController::InsertEvent(event); AIEventController::InsertEvent(event);
_current_company = old_company; _current_company = old_company;
event->Release();
} }
/* static */ void AI::BroadcastNewEvent(AIEvent *event, CompanyID skip_company) /* static */ void AI::BroadcastNewEvent(AIEvent *event, CompanyID skip_company)
{ {
/* AddRef() and Release() need to be called at least once, so do it here */
event->AddRef();
/* Clients should ignore events */ /* Clients should ignore events */
if (_networking && !_network_server) return; if (_networking && !_network_server) {
event->Release();
return;
}
/* Try to send the event to all AIs */ /* Try to send the event to all AIs */
for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) { for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
if (c != skip_company) AI::NewEvent(c, event); if (c != skip_company) AI::NewEvent(c, event);
} }
event->Release();
} }
void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2) void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2)