cpp/openttd-patchpack/source Changeset - r11116:176d9b7dabfd

Changeset - r11116:176d9b7dabfd

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 15 years ago 2009-02-13 00:18:56
yexo@openttd.org

(svn r15462) -Change [NoAI]: Make AIController::GetTick() and AIController::GetSetting() static functions.
-Fix (r15460): ai_controller.hpp.sq was forgotten.

3 files changed with 10 insertions and 10 deletions:

src/ai/api/ai_controller.cpp

src/ai/api/ai_controller.hpp

src/ai/api/ai_controller.hpp.sq

0 comments (0 inline, 0 general)

src/ai/api/ai_controller.cpp

➞

Show inline comments

@@ @@ -56,12 +56,12 @@ AIController::~AIController() @@
 	this->loaded_library.clear();
+}
 uint AIController::GetTick()
+/* static */ uint AIController::GetTick()
+{
-	return this->ticks;
+	return ::GetCompany(_current_company)->ai_instance->GetController()->ticks;
+}
 int AIController::GetSetting(const char *name)
+/* static */ int AIController::GetSetting(const char *name)
+{
 	return AIConfig::GetConfig(_current_company)->GetSetting(name);
+}

src/ai/api/ai_controller.hpp

➞

Show inline comments

@@ @@ -41,14 +41,14 @@ public: @@
 	 * Find at which tick your AI currently is.
 	 * @return returns the current tick.
 	 */
 	uint GetTick();
+	static uint GetTick();
 	/**
 	 * Get the value of one of your settings you set via info.nut.
 	 * @param name The name of the setting.
 	 * @return the value for the setting, or -1 if the setting is not known.
 	 */
 	int GetSetting(const char *name);
+	static int GetSetting(const char *name);
 	/**
 	 * Change the minimum amount of time the AI should be put in suspend mode

src/ai/api/ai_controller.hpp.sq

➞

Show inline comments

@@ @@ -5,10 +5,10 @@ @@
 void SQAIController_Register(Squirrel *engine) {
 	DefSQClass <AIController> SQAIController("AIController");
 	SQAIController.PreRegister(engine);
 	SQAIController.DefSQMethod(engine, &AIController::GetTick,               "GetTick",         1, "x");
 	SQAIController.DefSQStaticMethod(engine, &AIController::SetCommandDelay, "SetCommandDelay", 2, "xi");
 	SQAIController.DefSQStaticMethod(engine, &AIController::Sleep,           "Sleep",           2, "xi");
 	SQAIController.DefSQStaticMethod(engine, &AIController::GetSetting,      "GetSetting",      2, "xs");
 	SQAIController.DefSQStaticMethod(engine, &AIController::Print,           "Print",           3, "xbs");
 	SQAIController.DefSQStaticMethod(engine, &AIController::GetTick,         "GetTick",         1, "?");
 	SQAIController.DefSQStaticMethod(engine, &AIController::SetCommandDelay, "SetCommandDelay", 2, "?i");
 	SQAIController.DefSQStaticMethod(engine, &AIController::Sleep,           "Sleep",           2, "?i");
 	SQAIController.DefSQStaticMethod(engine, &AIController::GetSetting,      "GetSetting",      2, "?s");
 	SQAIController.DefSQStaticMethod(engine, &AIController::Print,           "Print",           3, "?bs");
 	SQAIController.PostRegister(engine);
+}

0 comments (0 inline, 0 general)