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

(svn r23357) -Codechange: move AIStorage to ScriptStorage

Browse Source
This commit is contained in:
truebrain
2011-11-29 23:21:04 +00:00
parent 0fbe10a2e3
commit b4112dcf8e
12 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/api/script_execmode.hpp
View File

@@ -23,7 +23,7 @@
*/
class ScriptExecMode : public ScriptObject {
private:
AIModeProc *last_mode; ///< The previous mode we were in.
ScriptModeProc *last_mode; ///< The previous mode we were in.
ScriptObject *last_instance; ///< The previous instace of the mode.
protected:

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

@@ -15,7 +15,7 @@
#include "../../network/network.h"
#include "../../tunnelbridge.h"
#include "../../ai/ai_storage.hpp"
#include "../script_storage.hpp"
#include "../../ai/ai_instance.hpp"
#include "script_error.hpp"
@@ -23,7 +23,7 @@
* Get the storage associated with the current AIInstance.
* @return The storage.
*/
static AIStorage *GetStorage()
static ScriptStorage *GetStorage()
{
return ScriptObject::GetActiveInstance()->GetStorage();
}
@@ -60,13 +60,13 @@ ScriptObject::ActiveInstance::~ActiveInstance()
return GetStorage()->delay;
}
/* static */ void ScriptObject::SetDoCommandMode(AIModeProc *proc, ScriptObject *instance)
/* static */ void ScriptObject::SetDoCommandMode(ScriptModeProc *proc, ScriptObject *instance)
{
GetStorage()->mode = proc;
GetStorage()->mode_instance = instance;
}
/* static */ AIModeProc *ScriptObject::GetDoCommandMode()
/* static */ ScriptModeProc *ScriptObject::GetDoCommandMode()
{
return GetStorage()->mode;
}

6
src/script/api/script_object.hpp
View File

@@ -26,7 +26,7 @@ typedef void (AISuspendCallbackProc)(class AIInstance *instance);
/**
* The callback function for Mode-classes.
*/
typedef bool (AIModeProc)();
typedef bool (ScriptModeProc)();
/**
* Uper-parent object of all API classes. You should never use this class in
@@ -122,12 +122,12 @@ protected:
/**
* Set the current mode of your AI to this proc.
*/
static void SetDoCommandMode(AIModeProc *proc, ScriptObject *instance);
static void SetDoCommandMode(ScriptModeProc *proc, ScriptObject *instance);
/**
* Get the current mode your AI is currently under.
*/
static AIModeProc *GetDoCommandMode();
static ScriptModeProc *GetDoCommandMode();
/**
* Get the instance of the current mode your AI is currently under.

2
src/script/api/script_testmode.hpp
View File

@@ -25,7 +25,7 @@
*/
class ScriptTestMode : public ScriptObject {
private:
AIModeProc *last_mode; ///< The previous mode we were in.
ScriptModeProc *last_mode; ///< The previous mode we were in.
ScriptObject *last_instance; ///< The previous instace of the mode.
protected: