JS scripts are now loaded via VFS, as per "JS optimization" email from stu.
This was SVN commit r1502.
This commit is contained in:
parent
fa25746df7
commit
32854fc162
@ -4,10 +4,8 @@
|
|||||||
#include "ScriptGlue.h"
|
#include "ScriptGlue.h"
|
||||||
#include "CConsole.h"
|
#include "CConsole.h"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <fstream>
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#include "res/vfs.h"
|
#include "res/res.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# include "float.h" // <- MT: Just for _finite(), converting certain strings was causing wierd bugs.
|
# include "float.h" // <- MT: Just for _finite(), converting certain strings was causing wierd bugs.
|
||||||
@ -102,6 +100,9 @@ void ScriptingHost::LoadScriptFromDisk(const std::string & fileName)
|
|||||||
jsval rval;
|
jsval rval;
|
||||||
JSBool ok = JS_EvaluateScript(m_Context, m_GlobalObject, (const char*)script, (unsigned int)script_len, fn, 0, &rval);
|
JSBool ok = JS_EvaluateScript(m_Context, m_GlobalObject, (const char*)script, (unsigned int)script_len, fn, 0, &rval);
|
||||||
|
|
||||||
|
int err = mem_free(script);
|
||||||
|
assert(err == 0);
|
||||||
|
|
||||||
if (ok == JS_FALSE)
|
if (ok == JS_FALSE)
|
||||||
throw PSERROR_Scripting_LoadFile_EvalErrors();
|
throw PSERROR_Scripting_LoadFile_EvalErrors();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user