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

(svn r23293) -Codechange: make LoadScript/LoadFile non-static

Browse Source
This commit is contained in:
truebrain
2011-11-23 13:37:48 +00:00
parent f4735ce234
commit 54ec3a2a3f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/squirrel.cpp
View File

@@ -425,7 +425,7 @@ static SQInteger _io_file_read(SQUserPointer file, SQUserPointer buf, SQInteger
return ret;
}
/* static */ SQRESULT Squirrel::LoadFile(HSQUIRRELVM vm, const char *filename, SQBool printerror)
SQRESULT Squirrel::LoadFile(HSQUIRRELVM vm, const char *filename, SQBool printerror)
{
size_t size;
FILE *file = FioFOpenFile(filename, "rb", AI_DIR, &size);
@@ -477,7 +477,7 @@ static SQInteger _io_file_read(SQUserPointer file, SQUserPointer buf, SQInteger
return sq_throwerror(vm, _SC("cannot open the file"));
}
/* static */ bool Squirrel::LoadScript(HSQUIRRELVM vm, const char *script, bool in_root)
bool Squirrel::LoadScript(HSQUIRRELVM vm, const char *script, bool in_root)
{
/* Make sure we are always in the root-table */
if (in_root) sq_pushroottable(vm);

4
src/script/squirrel.hpp
View File

@@ -69,12 +69,12 @@ public:
* @return False if loading failed.
*/
bool LoadScript(const char *script);
static bool LoadScript(HSQUIRRELVM vm, const char *script, bool in_root = true);
bool LoadScript(HSQUIRRELVM vm, const char *script, bool in_root = true);
/**
* Load a file to a given VM.
*/
static SQRESULT LoadFile(HSQUIRRELVM vm, const char *filename, SQBool printerror);
SQRESULT LoadFile(HSQUIRRELVM vm, const char *filename, SQBool printerror);
/**
* Adds a function to the stack. Depending on the current state this means

3
src/script/squirrel_std.cpp
View File

@@ -71,7 +71,8 @@ SQInteger SquirrelStd::require(HSQUIRRELVM vm)
for (char *n = filen; *n != '\0'; n++) if (*n == '/') *n = PATHSEPCHAR;
#endif
bool ret = Squirrel::LoadScript(vm, filen);
Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
bool ret = engine->LoadScript(vm, filen);
/* Reset the top, so the stack stays correct */
sq_settop(vm, top);