cpp/openttd-patchpack/source Changeset - r12087:0095f1069b29

Changeset - r12087:0095f1069b29

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

yexo - 15 years ago 2009-06-01 22:00:47
yexo@openttd.org

(svn r16502) -Fix [FS#2935]: when an AI was suspended while in a function called (indirectly) via call/acall/pcall OpenTTD crashed. Fix this by disallowing AIs to be suspended while called via call/acall/pcall.
IMPORTANT FOR AI WRITERS: AIs can no longer call any DoCommand functions (change anything, build vehicles, etc.) in a function called (indirectly) via call/acall/pcall. Where possible, please rewrite your code so it doesn't use call/acall/pcall

6 files changed with 24 insertions and 1 deletions:

src/3rdparty/squirrel/include/squirrel.h

src/3rdparty/squirrel/squirrel/sqapi.cpp

src/ai/ai_instance.hpp

src/ai/api/ai_object.cpp

src/script/squirrel.cpp

src/script/squirrel.hpp

0 comments (0 inline, 0 general)

src/3rdparty/squirrel/include/squirrel.h

➞

Show inline comments

@@ @@ -275,6 +275,7 @@ typedef struct tagSQRegFunction{ @@
 }SQRegFunction;
 /*vm*/
 SQUIRREL_API bool sq_can_suspend(HSQUIRRELVM v);
 SQUIRREL_API HSQUIRRELVM sq_open(SQInteger initialstacksize);
 SQUIRREL_API HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, SQInteger initialstacksize);
 SQUIRREL_API void sq_seterrorhandler(HSQUIRRELVM v);

src/3rdparty/squirrel/squirrel/sqapi.cpp

➞

Show inline comments

@@ @@ -90,6 +90,11 @@ SQInteger sq_getvmstate(HSQUIRRELVM v) @@
+	}
+}
 bool sq_can_suspend(HSQUIRRELVM v)
+{
 	return v->_can_suspend;
+}
 void sq_seterrorhandler(HSQUIRRELVM v)
+{
 	SQObject o = stack_get(v, -1);

src/ai/ai_instance.hpp

➞

Show inline comments

@@ @@ -30,6 +30,7 @@ private: @@
 class AIInstance {
 public:
 	friend class AIObject;
 	AIInstance(class AIInfo *info);
 	~AIInstance();

src/ai/api/ai_object.cpp

➞

Show inline comments

@@ @@ -2,6 +2,11 @@ @@
 /** @file ai_object.cpp Implementation of AIObject. */
 #include "../../stdafx.h"
 #include <squirrel.h>
 #include "../../script/squirrel.hpp"
 #include "../../company_base.h"
 #include "ai_log.hpp"
 #include "table/strings.h"
 #include "../ai.hpp"
@@ @@ -158,7 +163,8 @@ void AIObject::SetAllowDoCommand(bool al @@
 bool AIObject::GetAllowDoCommand()
+{
 	return GetStorage()->allow_do_command;
 	Squirrel *squirrel = Company::Get(_current_company)->ai_instance->engine;
 	return GetStorage()->allow_do_command && squirrel->CanSuspend();
+}
 void *&AIObject::GetEventPointer()

src/script/squirrel.cpp

➞

Show inline comments

@@ @@ -508,3 +508,8 @@ void Squirrel::ResetCrashed() @@
+{
 	this->crashed = false;
+}
 bool Squirrel::CanSuspend()
+{
 	return sq_can_suspend(this->vm);
+}

src/script/squirrel.hpp

➞

Show inline comments

@@ @@ -213,6 +213,11 @@ public: @@
 	 * Reset the crashed status.
 	 */
 	void ResetCrashed();
 	/**
 	 * Are we allowed to suspend the squirrel script at this moment?
 	 */
 	bool CanSuspend();
 };
 #endif /* SQUIRREL_HPP */

0 comments (0 inline, 0 general)