From ec8667a63cede8773358fc10f678f0962197497d Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 13 Jul 1998 21:00:09 +0000 Subject: [PATCH] Wrote access functions for current fgOPTIONS. --- Astro/orbits.cxx | 12 ++++++------ Astro/stars.cxx | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Astro/orbits.cxx b/Astro/orbits.cxx index 5fc84e1f..58521f1d 100644 --- a/Astro/orbits.cxx +++ b/Astro/orbits.cxx @@ -111,16 +111,13 @@ int fgReadOrbElements(struct OrbElements *dest, gzFile src) { int fgSolarSystemInit(fgTIME t) { - fgOPTIONS *o; char path[256], gzpath[256]; int i, ret_val; fgPrintf( FG_ASTRO, FG_INFO, "Initializing solar system\n"); /* build the full path name to the orbital elements database file */ - o = ¤t_options; - path[0] = '\0'; - strcat(path, o->fg_root); + current_options.get_fg_root(path); strcat(path, "/Scenery/"); strcat(path, "Planets"); @@ -170,9 +167,12 @@ void fgSolarSystemUpdate(struct OrbElements *planet, fgTIME t) /* $Log$ -/* Revision 1.6 1998/05/29 20:35:41 curt -/* Added zlib support for reading in compressed data files. +/* Revision 1.7 1998/07/13 21:00:09 curt +/* Wrote access functions for current fgOPTIONS. /* + * Revision 1.6 1998/05/29 20:35:41 curt + * Added zlib support for reading in compressed data files. + * * Revision 1.5 1998/05/13 18:25:34 curt * Root path info moved to fgOPTIONS. * diff --git a/Astro/stars.cxx b/Astro/stars.cxx index f23ec49b..be7989ee 100644 --- a/Astro/stars.cxx +++ b/Astro/stars.cxx @@ -64,7 +64,6 @@ /* Initialize the Star Management Subsystem */ int fgStarsInit( void ) { fgFile fd; - fgOPTIONS *o; /* struct CelestialCoord pltPos; */ char path[256], gzpath[256]; char line[256], name[256]; @@ -76,11 +75,8 @@ int fgStarsInit( void ) { fgPrintf( FG_ASTRO, FG_INFO, "Initializing stars\n"); - o = ¤t_options; - /* build the full path name to the stars data base file */ - path[0] = '\0'; - strcat(path, o->fg_root); + current_options.get_fg_root(path); strcat(path, "/Scenery/"); strcat(path, "Stars"); @@ -265,9 +261,12 @@ void fgStarsRender( void ) { /* $Log$ -/* Revision 1.7 1998/05/29 20:35:42 curt -/* Added zlib support for reading in compressed data files. +/* Revision 1.8 1998/07/13 21:00:10 curt +/* Wrote access functions for current fgOPTIONS. /* + * Revision 1.7 1998/05/29 20:35:42 curt + * Added zlib support for reading in compressed data files. + * * Revision 1.6 1998/05/13 18:25:35 curt * Root path info moved to fgOPTIONS. *