diff options
| author | frosch <frosch@openttd.org> | 2010-06-05 12:16:12 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-06-05 12:16:12 +0000 |
| commit | 1d3adb2b66989630b2a3c201ac1210a886d41a51 (patch) | |
| tree | c7c2c22646cfdeb1312455bfd9d59674b7ff96be /src/ai/ai_core.cpp | |
| parent | 406c2a986571ce594f491c0fde225b89f14ac8c3 (diff) | |
| download | openttd-1d3adb2b66989630b2a3c201ac1210a886d41a51.tar.xz | |
(svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation.
Diffstat (limited to 'src/ai/ai_core.cpp')
| -rw-r--r-- | src/ai/ai_core.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp index f61bc058c..8d333877f 100644 --- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -69,7 +69,7 @@ assert(_settings_game.difficulty.competitor_speed <= 4); if ((AI::frame_counter & ((1 << (4 - _settings_game.difficulty.competitor_speed)) - 1)) != 0) return; - Backup<CompanyByte> cur_company(_current_company); + Backup<CompanyByte> cur_company(_current_company, FILE_LINE); const Company *c; FOR_ALL_COMPANIES(c) { if (c->is_ai) { @@ -96,7 +96,7 @@ { if (_networking && !_network_server) return; - Backup<CompanyByte> cur_company(_current_company, company); + Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); Company *c = Company::Get(company); delete c->ai_instance; @@ -112,7 +112,7 @@ { if (_networking && !_network_server) return; - Backup<CompanyByte> cur_company(_current_company, company); + Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); Company::Get(company)->ai_instance->Suspend(); cur_company.Restore(); @@ -201,7 +201,7 @@ } /* Queue the event */ - Backup<CompanyByte> cur_company(_current_company, company); + Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); AIEventController::InsertEvent(event); cur_company.Restore(); @@ -247,7 +247,7 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2) Company *c = Company::GetIfValid(company); assert(c != NULL && c->ai_instance != NULL); - Backup<CompanyByte> cur_company(_current_company, company); + Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); c->ai_instance->Save(); cur_company.Restore(); } else { @@ -261,7 +261,7 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2) Company *c = Company::GetIfValid(company); assert(c != NULL && c->ai_instance != NULL); - Backup<CompanyByte> cur_company(_current_company, company); + Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); c->ai_instance->Load(version); cur_company.Restore(); } else { |