From 2abfbafaf24f61a3c9ec462cce9a041dad73b889 Mon Sep 17 00:00:00 2001 From: Yexo Date: Tue, 20 Jan 2009 14:11:58 +0000 Subject: (svn r15167) -Fix [FS#2558]: The top of the stack was resetted after executing the first Ai tick causing random AI crashes. --- src/script/squirrel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index b75833f65..22e39562e 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -192,8 +192,9 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT sq_pushobject(this->vm, instance); sq_call(this->vm, 1, ret == NULL ? SQFalse : SQTrue, SQTrue, suspend); if (ret != NULL) sq_getstackobj(vm, -1, ret); - /* Reset the top */ - sq_settop(this->vm, top); + /* Reset the top, but don't do so for the AI main function, as we need + * a correct stack when resuming. */ + if (this->vm->_suspended == 0) sq_settop(this->vm, top); return this->vm->_suspended != 0; } -- cgit v1.2.3-54-g00ecf