Merge pull request #376 from Azaezel/alpha40_FixPrefLookup

be sure to executte defaults prior to clientprefs

Templates/BaseGame/game/core/Core.cs

@@ -27,11 +27,10 @@ function CoreModule::onCreate(%this)
    ModuleDatabase.LoadExplicit( "Core_PostFX" );
    ModuleDatabase.LoadExplicit( "Core_GameObjects" );
    
+   exec("data/defaults.cs");
    %prefPath = getPrefpath();
    if ( isFile( %prefPath @ "/clientPrefs.cs" ) )
       exec( %prefPath @ "/clientPrefs.cs" );
-   else
-      exec("data/defaults.cs");
       
    // Seed the random number generator.
    setRandomSeed();

Templates/BaseGame/game/core/clientServer/scripts/client/client.cs

@@ -15,11 +15,10 @@ function initClient()
    exec( "./levelLoad.cs" );
    
    //load prefs
+   exec( "data/defaults.cs" );
    %prefPath = getPrefpath();
    if ( isFile( %prefPath @ "/clientPrefs.cs" ) )
       exec( %prefPath @ "/clientPrefs.cs" );
-   else
-      exec( "data/defaults.cs" );
       
    callOnModules("initClient");
 

Templates/BaseGame/game/core/rendering/Core_Rendering.cs

@@ -33,11 +33,10 @@ function Core_Rendering::initClient(%this)
    initLightingSystems("Advanced Lighting"); 
 
    //load prefs
+   exec("data/defaults.cs");
    %prefPath = getPrefpath();
    if ( isFile( %prefPath @ "/clientPrefs.cs" ) )
       exec( %prefPath @ "/clientPrefs.cs" );
-   else
-      exec("data/defaults.cs");
    
    configureCanvas();