Commit 5c69415 1 parent 0420bc6 commit 5c69415 Copy full SHA for 5c69415
File tree 2 files changed +3
-1
lines changed
2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -537,6 +537,7 @@ LightInfo* Material::getDebugLight()
537
537
538
538
bool loadMaterialsFromJson (const char * path)
539
539
{
540
+ Con::errorf (" Loading materials from JSON file: %s" , path);
540
541
541
542
Stream* fs = ResourceManager->openStream (path);
542
543
if (fs == NULL ) return false ;
Original file line number Diff line number Diff line change @@ -363,6 +363,7 @@ function onStart()
363
363
// Load the scripts that start it all...
364
364
exec ( "./client/init.cs" ) ;
365
365
exec ( "./server/init.cs" ) ;
366
+ exec ( "~/data/init.cs" ) ;
366
367
exec ( "./data/GameMissionInfo.cs" ) ;
367
368
// init GameMissionInfo
368
369
GameMissionInfo . init ( ) ;
@@ -375,7 +376,7 @@ function onStart()
375
376
if ( $Server ::Dedicated )
376
377
{
377
378
// need to load up the materials so that we have friction properties and what not
378
- exec ( "~/data/init.cs" ) ;
379
+ // exec("~/data/init.cs");
379
380
380
381
// Load server scripts and resources
381
382
execServerScripts ( ) ;
You can’t perform that action at this time.
0 commit comments