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

Allow getGlobal() from JS code

Browse Source 
This was SVN commit r645.
This commit is contained in:
Ykkrosh 2004-07-07 18:27:25 +00:00
parent 2a26d9f506
commit c866494fdc
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/scripting/ScriptGlue.cpp
View File

@ -10,15 +10,17 @@
#include "scripting/JSInterface_Entity.h"
#include "scripting/JSInterface_BaseEntity.h"
#include "scripting/JSInterface_Vector3D.h"
#include "gui/scripting/JSInterface_IGUIObject.h"
extern CConsole* g_Console;
// Parameters for the table are:
// 1: The name the function will be called as from script
// 2: The number of aguments this function expects
// 3: Depreciated, always zero
// 4: Reserved for future use, always zero
// 0: The name the function will be called as from script
// 1: The function which will be called
// 2: The number of arguments this function expects
// 3: Flags (deprecated, always zero)
// 4: Extra (reserved for future use, always zero)
JSFunctionSpec ScriptFunctionTable[] =
{
@ -26,6 +28,8 @@ JSFunctionSpec ScriptFunctionTable[] =
{"writeConsole", writeConsole, 1, 0, 0 },
{"getEntityByHandle", getEntityByHandle, 1, 0, 0 },
{"getEntityTemplate", getEntityTemplate, 1, 0, 0 },
{"getGUIObjectByName", JSI_IGUIObject::getByName, 1, 0, 0 },
{"getGlobal", getGlobal, 0, 0, 0 },
{0, 0, 0, 0, 0},
};
@ -119,3 +123,9 @@ JSBool getEntityTemplate( JSContext* context, JSObject* globalObject, unsigned i
return( JS_TRUE );
}
JSBool getGlobal( JSContext* context, JSObject* globalObject, unsigned int argc, jsval* argv, jsval* rval )
{
*rval = OBJECT_TO_JSVAL( globalObject );
return( JS_TRUE );
}

7
source/scripting/ScriptGlue.h
View File

@ -4,12 +4,17 @@
#include "ScriptingHost.h"
JSBool WriteLog(JSContext * context, JSObject * globalObject, unsigned int argc, jsval *argv, jsval *rval);
// Functions to be called from Javascript:
JSBool WriteLog(JSContext * context, JSObject * globalObject, unsigned int argc, jsval *argv, jsval *rval);
JSBool writeConsole( JSContext* context, JSObject* globalObject, unsigned int argc, jsval* argv, jsval* rval );
JSBool getEntityByHandle( JSContext* context, JSObject* globalObject, unsigned int argc, jsval* argv, jsval* rval );
JSBool getEntityTemplate( JSContext* context, JSObject* globalObject, unsigned int argc, jsval* argv, jsval* rval );
// Returns the global object, e.g. for setting global variables.
JSBool getGlobal( JSContext* context, JSObject* globalObject, unsigned int argc, jsval* argv, jsval* rval );
extern JSFunctionSpec ScriptFunctionTable[];
#endif