fly/flightgear
1
0
Fork 0
Code Activity

- no longer allocate the root property node for globals; globals does

Browse source 
it itself
- tweaks to model path loading.
This commit is contained in:
curt 2001-06-01 17:53:09 +00:00
parent 57aacb64f3
commit 0ec19036b8
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Main/main.cxx
View file

@ -1389,9 +1389,7 @@ int main( int argc, char **argv ) {
// Allocate global data structures. This needs to happen before // Allocate global data structures. This needs to happen before
// we parse command line options // we parse command line options
SGPropertyNode *props = new SGPropertyNode;
globals = new FGGlobals; globals = new FGGlobals;
globals->set_props( props );
// seed the random number generater // seed the random number generater
sg_srandom_time(); sg_srandom_time();
@ -1603,15 +1601,14 @@ int main( int argc, char **argv ) {
#if !defined( PLIB_1_2_X ) #if !defined( PLIB_1_2_X )
// this should be redundant ... but it breaks for relative paths // 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 #endif
ssgTexturePath( (char *)full_model.dir().c_str() ); ssgTexturePath( (char *)full_model.dir().c_str() );
ssgEntity *acmodel_obj = ssgLoad( (char *)full_model.c_str() ); ssgEntity *acmodel_obj = ssgLoad( (char *)full_model.c_str() );
if( !acmodel_obj ) { if( !acmodel_obj ) {
// fall back to default // fall back to default
acmodel_obj = ssgLoad( (char *)"glider.ac" ); acmodel_obj = ssgLoad( (char *)"Models/Geometry/glider.ac" );
if( !acmodel_obj ) { if( !acmodel_obj ) {
SG_LOG( SG_GENERAL, SG_ALERT, "FAILED to LOAD an AC model! ..." ); SG_LOG( SG_GENERAL, SG_ALERT, "FAILED to LOAD an AC model! ..." );
exit(-1); exit(-1);