From 83f2785f54de1c31267c5586464c97fb39f95b5a Mon Sep 17 00:00:00 2001 From: truebrain Date: Mon, 19 Dec 2011 20:56:50 +0000 Subject: (svn r23611) -Add: run the begin of the script already while generating, and don't sleep on DoCommand while doing so --- src/script/api/script_object.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/script/api') 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 { -- cgit v1.2.3-54-g00ecf