dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23358) -Codechange: move AI_FatalError to Script_FatalError (and to its own file)

Browse Source
This commit is contained in:
truebrain
2011-11-29 23:21:13 +00:00
parent 99cb93ef6f
commit bbd9facb44
12 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/script/api/script_controller.cpp
View File

@@ -20,6 +20,7 @@
#include "../../ai/ai_instance.hpp"
#include "../../ai/ai_config.hpp"
#include "../../ai/ai.hpp"
#include "../script_fatalerror.hpp"
#include "script_log.hpp"
/* static */ void ScriptController::SetCommandDelay(int ticks)
@@ -31,7 +32,7 @@
/* static */ void ScriptController::Sleep(int ticks)
{
if (!ScriptObject::CanSuspend()) {
throw AI_FatalError("You are not allowed to call Sleep in your constructor, Save(), Load(), and any valuator.");
throw Script_FatalError("You are not allowed to call Sleep in your constructor, Save(), Load(), and any valuator.");
}
if (ticks <= 0) {

3
src/script/api/script_execmode.cpp
View File

@@ -14,6 +14,7 @@
#include "../../company_base.h"
#include "../../company_func.h"
#include "../../ai/ai_instance.hpp"
#include "../script_fatalerror.hpp"
bool ScriptExecMode::ModeProc()
{
@@ -34,7 +35,7 @@ ScriptExecMode::~ScriptExecMode()
if (this->GetDoCommandModeInstance() != this) {
/* Ignore this error if the AI already died. */
if (!ScriptObject::GetActiveInstance()->IsDead()) {
throw AI_FatalError("ScriptExecMode object was removed while it was not the latest AI*Mode object created.");
throw Script_FatalError("ScriptExecMode object was removed while it was not the latest AI*Mode object created.");
}
}
this->SetDoCommandMode(this->last_mode, this->last_instance);

3
src/script/api/script_object.cpp
View File

@@ -17,6 +17,7 @@
#include "../script_storage.hpp"
#include "../../ai/ai_instance.hpp"
#include "../script_fatalerror.hpp"
#include "script_error.hpp"
/**
@@ -226,7 +227,7 @@ ScriptObject::ActiveInstance::~ActiveInstance()
/* static */ bool ScriptObject::DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint cmd, const char *text, AISuspendCallbackProc *callback)
{
if (!ScriptObject::CanSuspend()) {
throw AI_FatalError("You are not allowed to execute any DoCommand (even indirect) in your constructor, Save(), Load(), and any valuator.");
throw Script_FatalError("You are not allowed to execute any DoCommand (even indirect) in your constructor, Save(), Load(), and any valuator.");
}
/* Set the default callback to return a true/false result of the DoCommand */

3
src/script/api/script_testmode.cpp
View File

@@ -14,6 +14,7 @@
#include "../../company_base.h"
#include "../../company_func.h"
#include "../../ai/ai_instance.hpp"
#include "../script_fatalerror.hpp"
bool ScriptTestMode::ModeProc()
{
@@ -34,7 +35,7 @@ ScriptTestMode::~ScriptTestMode()
if (this->GetDoCommandModeInstance() != this) {
/* Ignore this error if the AI already died. */
if (!ScriptObject::GetActiveInstance()->IsDead()) {
throw AI_FatalError("AITestmode object was removed while it was not the latest AI*Mode object created.");
throw Script_FatalError("AITestmode object was removed while it was not the latest AI*Mode object created.");
}
}
this->SetDoCommandMode(this->last_mode, this->last_instance);