From 0ec19036b871a5c6429962de4ba78680694d7334 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 1 Jun 2001 17:53:09 +0000 Subject: [PATCH] - no longer allocate the root property node for globals; globals does it itself - tweaks to model path loading. --- src/Main/main.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 05d1ff545..39ff52945 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -1389,9 +1389,7 @@ int main( int argc, char **argv ) { // Allocate global data structures. This needs to happen before // we parse command line options - SGPropertyNode *props = new SGPropertyNode; globals = new FGGlobals; - globals->set_props( props ); // seed the random number generater sg_srandom_time(); @@ -1603,15 +1601,14 @@ int main( int argc, char **argv ) { #if !defined( PLIB_1_2_X ) // this should be redundant ... but it breaks for relative paths - // w/ plib-1.2.0 - ssgModelPath( (char *)full_model.dir().c_str() ); + // ssgModelPath( (char *)full_model.dir().c_str() ); #endif ssgTexturePath( (char *)full_model.dir().c_str() ); ssgEntity *acmodel_obj = ssgLoad( (char *)full_model.c_str() ); if( !acmodel_obj ) { // fall back to default - acmodel_obj = ssgLoad( (char *)"glider.ac" ); + acmodel_obj = ssgLoad( (char *)"Models/Geometry/glider.ac" ); if( !acmodel_obj ) { SG_LOG( SG_GENERAL, SG_ALERT, "FAILED to LOAD an AC model! ..." ); exit(-1);