summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-08-20 10:39:39 +0000
committeryexo <yexo@openttd.org>2009-08-20 10:39:39 +0000
commit14b5862c229a7003fbb0dc259386dc1153048c56 (patch)
tree7b9b888a24c43d2028d72eb4b44c1b284cbfb094 /src
parent0960f15c7ed46ac71881456ed71dfcd0a33ae4bb (diff)
downloadopenttd-14b5862c229a7003fbb0dc259386dc1153048c56.tar.xz
(svn r17230) -Fix (r15027): don't assert when an AI uses AI*Mode objects incorrectly but crash the AI instead
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/squirrel/squirrel/sqclass.h12
-rw-r--r--src/ai/ai_instance.cpp2
-rw-r--r--src/ai/api/ai_execmode.cpp11
-rw-r--r--src/ai/api/ai_testmode.cpp11
4 files changed, 33 insertions, 3 deletions
diff --git a/src/3rdparty/squirrel/squirrel/sqclass.h b/src/3rdparty/squirrel/squirrel/sqclass.h
index 06f2b51e9..895c053c2 100644
--- a/src/3rdparty/squirrel/squirrel/sqclass.h
+++ b/src/3rdparty/squirrel/squirrel/sqclass.h
@@ -128,7 +128,17 @@ public:
}
void Release() {
_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--;
if(_uiRef > 0) return;
SQInteger size = _memsize;
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index a5ef5135b..6e1ffa0c1 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -353,6 +353,7 @@ void AIInstance::GameLoop()
this->suspend = e.GetSuspendTime();
this->callback = e.GetSuspendCallback();
} catch (AI_FatalError e) {
+ this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage());
this->engine->ResumeError();
this->Died();
@@ -373,6 +374,7 @@ void AIInstance::GameLoop()
this->suspend = e.GetSuspendTime();
this->callback = e.GetSuspendCallback();
} catch (AI_FatalError e) {
+ this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage());
this->engine->ResumeError();
this->Died();
diff --git a/src/ai/api/ai_execmode.cpp b/src/ai/api/ai_execmode.cpp
index 941718bee..b51adfd48 100644
--- a/src/ai/api/ai_execmode.cpp
+++ b/src/ai/api/ai_execmode.cpp
@@ -4,6 +4,9 @@
#include "ai_execmode.hpp"
#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)
{
@@ -21,6 +24,12 @@ 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);
}
diff --git a/src/ai/api/ai_testmode.cpp b/src/ai/api/ai_testmode.cpp
index 484333b42..114366722 100644
--- a/src/ai/api/ai_testmode.cpp
+++ b/src/ai/api/ai_testmode.cpp
@@ -4,6 +4,9 @@
#include "ai_testmode.hpp"
#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)
{
@@ -21,6 +24,12 @@ 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);
}