Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

JS scripts are now loaded via VFS, as per "JS optimization" email from stu.

Browse Source 
This was SVN commit r1502.
This commit is contained in:
janwas 2004-12-15 14:23:27 +00:00
parent fa25746df7
commit 32854fc162
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/scripting/ScriptingHost.cpp
View File

@ -4,10 +4,8 @@
#include "ScriptGlue.h"
#include "CConsole.h"
#include <sstream>
#include <fstream>
#include <iostream>
#include "res/vfs.h"
#include "res/res.h"
#ifdef _WIN32
# 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;
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)
throw PSERROR_Scripting_LoadFile_EvalErrors();
}