Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17230) -Fix (r15027): don't assert when an AI uses AI*Mode objects incorrectly but crash the AI instead

Browse Source
This commit is contained in:
yexo 2009-08-20 10:39:39 +00:00
parent 0960f15c7e
commit 14b5862c22
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/3rdparty/squirrel/squirrel/sqclass.h vendored
View File

@ -128,7 +128,17 @@ public:
} }
void Release() { void Release() {
_uiRef++; _uiRef++;
if (_hook) { _hook(_userpointer,0);} try {
if (_hook) { _hook(_userpointer,0);}
} catch (...) {
_uiRef--;
if (_uiRef == 0) {
SQInteger size = _memsize;
this->~SQInstance();
SQ_FREE(this, size);
}
throw;
}
_uiRef--; _uiRef--;
if(_uiRef > 0) return; if(_uiRef > 0) return;
SQInteger size = _memsize; SQInteger size = _memsize;

2
src/ai/ai_instance.cpp
View File

@ -353,6 +353,7 @@ void AIInstance::GameLoop()
this->suspend = e.GetSuspendTime(); this->suspend = e.GetSuspendTime();
this->callback = e.GetSuspendCallback(); this->callback = e.GetSuspendCallback();
} catch (AI_FatalError e) { } catch (AI_FatalError e) {
this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage()); this->engine->ThrowError(e.GetErrorMessage());
this->engine->ResumeError(); this->engine->ResumeError();
this->Died(); this->Died();
@ -373,6 +374,7 @@ void AIInstance::GameLoop()
this->suspend = e.GetSuspendTime(); this->suspend = e.GetSuspendTime();
this->callback = e.GetSuspendCallback(); this->callback = e.GetSuspendCallback();
} catch (AI_FatalError e) { } catch (AI_FatalError e) {
this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage()); this->engine->ThrowError(e.GetErrorMessage());
this->engine->ResumeError(); this->engine->ResumeError();
this->Died(); this->Died();

11
src/ai/api/ai_execmode.cpp
View File

@ -4,6 +4,9 @@
#include "ai_execmode.hpp" #include "ai_execmode.hpp"
#include "../../command_type.h" #include "../../command_type.h"
#include "../../company_base.h"
#include "../../company_func.h"
#include "../ai_instance.hpp"
bool AIExecMode::ModeProc(TileIndex tile, uint32 p1, uint32 p2, uint procc, CommandCost costs) bool AIExecMode::ModeProc(TileIndex tile, uint32 p1, uint32 p2, uint procc, CommandCost costs)
{ {
@ -21,6 +24,12 @@ AIExecMode::AIExecMode()
AIExecMode::~AIExecMode() AIExecMode::~AIExecMode()
{ {
assert(this->GetDoCommandModeInstance() == this); if (this->GetDoCommandModeInstance() != this) {
AIInstance *instance = Company::Get(_current_company)->ai_instance;
/* Ignore this error if the AI already died. */
if (!instance->IsDead()) {
throw AI_FatalError("AIExecMode object was removed while it was not the latest AI*Mode object created.");
}
}
this->SetDoCommandMode(this->last_mode, this->last_instance); this->SetDoCommandMode(this->last_mode, this->last_instance);
} }

11
src/ai/api/ai_testmode.cpp
View File

@ -4,6 +4,9 @@
#include "ai_testmode.hpp" #include "ai_testmode.hpp"
#include "../../command_type.h" #include "../../command_type.h"
#include "../../company_base.h"
#include "../../company_func.h"
#include "../ai_instance.hpp"
bool AITestMode::ModeProc(TileIndex tile, uint32 p1, uint32 p2, uint procc, CommandCost costs) bool AITestMode::ModeProc(TileIndex tile, uint32 p1, uint32 p2, uint procc, CommandCost costs)
{ {
@ -21,6 +24,12 @@ AITestMode::AITestMode()
AITestMode::~AITestMode() AITestMode::~AITestMode()
{ {
assert(this->GetDoCommandModeInstance() == this); if (this->GetDoCommandModeInstance() != this) {
AIInstance *instance = Company::Get(_current_company)->ai_instance;
/* Ignore this error if the AI already died. */
if (!instance->IsDead()) {
throw AI_FatalError("AITestmode object was removed while it was not the latest AI*Mode object created.");
}
}
this->SetDoCommandMode(this->last_mode, this->last_instance); this->SetDoCommandMode(this->last_mode, this->last_instance);
} }