summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
Diffstat (limited to 'src/script')
-rw-r--r--src/script/api/script_object.cpp9
-rw-r--r--src/script/script_instance.hpp6
2 files changed, 13 insertions, 2 deletions
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index 1dd431d80..d9a432b44 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -15,6 +15,7 @@
#include "../../company_func.h"
#include "../../network/network.h"
#include "../../tunnelbridge.h"
+#include "../../genworld.h"
#include "../script_storage.hpp"
#include "../script_instance.hpp"
@@ -233,7 +234,7 @@ ScriptObject::ActiveInstance::~ActiveInstance()
#endif
/* Try to perform the command. */
- CommandCost res = ::DoCommandPInternal(tile, p1, p2, cmd, _networking ? ScriptObject::GetActiveInstance()->GetDoCommandCallback() : NULL, text, false, estimate_only);
+ CommandCost res = ::DoCommandPInternal(tile, p1, p2, cmd, (_networking && !_generating_world) ? ScriptObject::GetActiveInstance()->GetDoCommandCallback() : NULL, text, false, estimate_only);
/* We failed; set the error and bail out */
if (res.Failed()) {
@@ -254,7 +255,11 @@ ScriptObject::ActiveInstance::~ActiveInstance()
SetLastCost(res.GetCost());
SetLastCommandRes(true);
- if (_networking) {
+ if (_generating_world) {
+ IncreaseDoCommandCosts(res.GetCost());
+ if (callback != NULL) callback(GetActiveInstance());
+ return true;
+ } else if (_networking) {
/* Suspend the AI till the command is really executed. */
throw Script_Suspend(-(int)GetDoCommandDelay(), callback);
} else {
diff --git a/src/script/script_instance.hpp b/src/script/script_instance.hpp
index 8aa85744c..e7a23ccd9 100644
--- a/src/script/script_instance.hpp
+++ b/src/script/script_instance.hpp
@@ -159,6 +159,12 @@ public:
*/
void InsertEvent(class ScriptEvent *event);
+ /**
+ * Check if the instance is sleeping, which either happened because the
+ * script executed a DoCommand, or executed this.Sleep().
+ */
+ bool IsSleeping() { return this->suspend != 0; }
+
protected:
class Squirrel *engine; ///< A wrapper around the squirrel vm.