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

(svn r23611) -Add: run the begin of the script already while generating, and don't sleep on DoCommand while doing so

Browse Source
This commit is contained in:
truebrain
2011-12-19 20:56:50 +00:00
parent cbe43abe5d
commit 83f2785f54
7 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {