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

(svn r15284) -Fix [FS#2582] (r15045): Parameters were popped from the squirrel stack twice.

release/0.7
Yexo 2009-01-27 13:11:11 +00:00
parent 9bb57ec840
commit ea01534e6d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ai/ai_instance.cpp
View File

@ -606,6 +606,7 @@ void AIInstance::Load(int version)
return; return;
} }
HSQUIRRELVM vm = this->engine->GetVM(); HSQUIRRELVM vm = this->engine->GetVM();
SQInteger old_top = sq_gettop(vm);
SlObject(NULL, _ai_byte); SlObject(NULL, _ai_byte);
/* Check if there was anything saved at all. */ /* Check if there was anything saved at all. */
@ -624,12 +625,17 @@ void AIInstance::Load(int version)
if (this->engine->MethodExists(*this->instance, "Load")) { if (this->engine->MethodExists(*this->instance, "Load")) {
sq_call(vm, 3, SQFalse, SQFalse); sq_call(vm, 3, SQFalse, SQFalse);
/* Pop 1) the object instance, 2) the (null) result. */
sq_pop(vm, 2);
} else { } else {
AILog::Warning("Loading failed: there was data for the AI to load, but the AI does not have a Load() function."); AILog::Warning("Loading failed: there was data for the AI to load, but the AI does not have a Load() function.");
/* Pop 1) the object instance, 2) the function name, 3) the instance again, 4) the version */
sq_pop(vm, 4);
} }
/* Pop 1) the object instance, 2) the function name, 3) the instance again, 4) the (null) result. */ assert(sq_gettop(vm) == old_top);
sq_pop(vm, 4);
AIObject::SetAllowDoCommand(true); AIObject::SetAllowDoCommand(true);
return; return;