mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-24 06:47:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for two pathfinding bugs (neither of which were actually pathfinding bugs), added player objects (details in TM)

Browse Source 
This was SVN commit r1733.
This commit is contained in:
MarkT
2005-01-18 00:46:18 +00:00
parent 4b5aff926d
commit 25fdbfd931
13 changed files with 135 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/ScriptObject.cpp
+31 -1
View File
@@ -8,6 +8,27 @@ CScriptObject::CScriptObject()
Function = NULL;
}
CScriptObject::~CScriptObject()
{
Uproot();
}
void CScriptObject::Root()
{
if( !Function )
return;
FunctionObject = JS_GetFunctionObject( Function );
JS_AddRoot( g_ScriptingHost.GetContext(), &FunctionObject );
}
void CScriptObject::Uproot()
{
if( Function )
JS_RemoveRoot( g_ScriptingHost.GetContext(), &FunctionObject );
}
CScriptObject::CScriptObject( JSFunction* _Function )
{
SetFunction( _Function );
@@ -20,7 +41,11 @@ CScriptObject::CScriptObject( jsval v )
void CScriptObject::SetFunction( JSFunction* _Function )
{
Uproot();
Function = _Function;
Root();
}
void CScriptObject::SetJSVal( jsval v )
@@ -43,7 +68,7 @@ void CScriptObject::SetJSVal( jsval v )
JSObject* CScriptObject::GetFunctionObject()
{
if( Function )
return( JS_GetFunctionObject( Function ) );
return( FunctionObject );
return( NULL );
}
@@ -78,7 +103,12 @@ bool CScriptObject::DispatchEvent( JSObject* Context, CScriptEvent* evt )
void CScriptObject::Compile( CStrW FileNameTag, CStrW FunctionBody )
{
if( Function )
JS_RemoveRoot( g_ScriptingHost.GetContext(), &Function );
const char* argnames[] = { "evt" };
utf16string str16=FunctionBody.utf16();
Function = JS_CompileUCFunction( g_ScriptingHost.GetContext(), NULL, NULL, 1, argnames, str16.c_str(), str16.size(), (CStr)FileNameTag, 0 );
Root();
}