# Housekeeping.

- Jan and I cleaned up CJSComplex and put all the function bodies and
helper classes in ScriptableComplex.inl. This also required minor
changes to other files.
- Removed a debug message from Technology.cpp.

This was SVN commit r4173.

source/ps/GameSetup/GameSetup.cpp

@@ -59,6 +59,7 @@
 
 #include "scripting/ScriptingHost.h"
 #include "scripting/GameEvents.h"
+#include "scripting/ScriptableComplex.h"
 #include "maths/scripting/JSInterface_Vector3D.h"
 #include "graphics/scripting/JSInterface_Camera.h"
 #include "ps/scripting/JSInterface_Selection.h"
@@ -501,7 +502,8 @@ static void InitScripting()
 	CPlayer::ScriptingInit();
 
 	PlayerCollection::Init( "PlayerCollection" );
-	CJSComplexPropertyAccessor<CEntity>::ScriptingInit(); // <-- Doesn't really matter which we use, but we know CJSPropertyAccessor<T> is already being compiled for T = CEntity.
+	//CJSComplexPropertyAccessor<CEntity>::ScriptingInit(); // <-- Doesn't really matter which we use, but we know CJSPropertyAccessor<T> is already being compiled for T = CEntity.
+	ScriptableComplex_InitComplexPropertyAccessor<CEntity>();
 	CScriptEvent::ScriptingInit();
 	CJSProgressTimer::ScriptingInit();
 	CProjectile::ScriptingInit();

source/scripting/ScriptableComplex.cpp

@@ -3,7 +3,11 @@
 
 #include "lib/allocators.h"
 
+//-----------------------------------------------------------------------------
 // suballocator for CJSComplex.m_Properties elements
+// (must come after property defs)
+//-----------------------------------------------------------------------------
+
 static Bucket bucket;
 // HACK: it needs to be created/destroyed; since there is no
 // global init/shutdown call here, we keep a refcnt. this assumes that
@@ -38,3 +42,4 @@ void jscomplexproperty_suballoc_free(IJSComplexProperty* p)
 	p->~IJSComplexProperty();
 	bucket_free(&bucket, p);
 }
+

source/simulation/Technology.cpp

@@ -441,8 +441,6 @@ void CTechnology::ScriptingInit()
 	AddMethod<jsval, &CTechnology::GetPlayerID>( "getPlayerID", 0 );
 
 	CJSObject<CTechnology>::ScriptingInit("Technology");
-
-	debug_printf("CTechnology::ScriptingInit complete");
 }
 
 jsval CTechnology::ApplyEffects( JSContext* UNUSED(cx), uintN UNUSED(argc), jsval* UNUSED(argv) )