diff options
author | yexo <yexo@openttd.org> | 2011-11-04 23:14:23 +0000 |
---|---|---|
committer | yexo <yexo@openttd.org> | 2011-11-04 23:14:23 +0000 |
commit | 02913f40b0ab1a7771e96e4c6af4ef15b6953cc7 (patch) | |
tree | a1fc33d33a53e45772823fe528d73d8194eb91ad /src/script | |
parent | 3e016e4254c6b8b558c50e7c66bc01ac6d118f4b (diff) | |
download | openttd-02913f40b0ab1a7771e96e4c6af4ef15b6953cc7.tar.xz |
(svn r23117) -Fix: [NoAI] calling require() to include a file gave you 100.000 opcodes for free
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/squirrel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index b9151e727..890630eeb 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -481,15 +481,19 @@ static SQInteger _io_file_read(SQUserPointer file, SQUserPointer buf, SQInteger /* Make sure we are always in the root-table */ if (in_root) sq_pushroottable(vm); + SQInteger ops_left = vm->_ops_till_suspend; /* Load and run the script */ if (SQ_SUCCEEDED(LoadFile(vm, script, SQTrue))) { sq_push(vm, -2); if (SQ_SUCCEEDED(sq_call(vm, 1, SQFalse, SQTrue, 100000))) { sq_pop(vm, 1); + /* After compiling the file we want to reset the amount of opcodes. */ + vm->_ops_till_suspend = ops_left; return true; } } + vm->_ops_till_suspend = ops_left; DEBUG(misc, 0, "[squirrel] Failed to compile '%s'", script); return false; } |