mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25305) -Fix [FS#5561]: Game Script APIs that execute a DoCommand were returning the same result as in TestMode during world generation

release/1.4
zuu 2013-05-29 19:31:58 +00:00
parent 2547523c0f
commit a58427115c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,12 @@ ScriptObject::ActiveInstance::~ActiveInstance()
if (_generating_world) { if (_generating_world) {
IncreaseDoCommandCosts(res.GetCost()); IncreaseDoCommandCosts(res.GetCost());
if (callback != NULL) callback(GetActiveInstance()); if (callback != NULL) {
/* Insert return value into to stack and throw a control code that
* the return value in the stack should be used. */
callback(GetActiveInstance());
throw SQInteger(1);
}
return true; return true;
} else if (_networking) { } else if (_networking) {
/* Suspend the script till the command is really executed. */ /* Suspend the script till the command is really executed. */

12
src/script/squirrel.cpp
View File

@ -541,15 +541,19 @@ Squirrel::~Squirrel()
void Squirrel::InsertResult(bool result) void Squirrel::InsertResult(bool result)
{ {
sq_pushbool(this->vm, result); sq_pushbool(this->vm, result);
vm->GetAt(vm->_stackbase + vm->_suspended_target) = vm->GetUp(-1); if (this->IsSuspended()) { // Called before resuming a suspended script?
vm->Pop(); vm->GetAt(vm->_stackbase + vm->_suspended_target) = vm->GetUp(-1);
vm->Pop();
}
} }
void Squirrel::InsertResult(int result) void Squirrel::InsertResult(int result)
{ {
sq_pushinteger(this->vm, result); sq_pushinteger(this->vm, result);
vm->GetAt(vm->_stackbase + vm->_suspended_target) = vm->GetUp(-1); if (this->IsSuspended()) { // Called before resuming a suspended script?
vm->Pop(); vm->GetAt(vm->_stackbase + vm->_suspended_target) = vm->GetUp(-1);
vm->Pop();
}
} }
/* static */ void Squirrel::DecreaseOps(HSQUIRRELVM vm, int ops) /* static */ void Squirrel::DecreaseOps(HSQUIRRELVM vm, int ops)