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

(svn r26617) -Fix [FS#5973]: [Script] Loading/parsing of info .nuts was done in the same VM, causing e.g. constants to break the loading of info of other scripts

Browse Source
This commit is contained in:
rubidium
2014-05-25 19:53:46 +00:00
parent 105306609f
commit a6b4e59963
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/script/script_scanner.cpp
View File

@@ -53,9 +53,9 @@ bool ScriptScanner::AddFile(const char *filename, size_t basepath_length, const
if (!FioCheckFileExists(filename, this->subdir) || !FioCheckFileExists(this->main_script, this->subdir)) return false;
/* We don't care if one of the other scripts failed to load. */
this->engine->ResetCrashed();
this->ResetEngine();
this->engine->LoadScript(filename);
return true;
}
@@ -66,17 +66,20 @@ ScriptScanner::ScriptScanner() :
{
}
void ScriptScanner::ResetEngine()
{
this->engine->Reset();
this->engine->SetGlobalPointer(this);
this->RegisterAPI(this->engine);
}
void ScriptScanner::Initialize(const char *name)
{
this->engine = new Squirrel(name);
/* Mark this class as global pointer */
this->engine->SetGlobalPointer(this);
this->RegisterAPI(this->engine);
this->RescanDir();
this->engine->ResetCrashed();
this->ResetEngine();
}
ScriptScanner::~ScriptScanner()