Modified Files:

[simgear.git] / simgear / ephemeris / stardata.cxx

diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index f153b5272c591d0f958b59bf875e71fb6ef9b5aa..7f04b8b21055f7cb93824ee8c4d2ad2694e9741f 100644 (file)
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -14,29 +14,35 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #include "stardata.hxx"
 
-#if defined (_MSC_VER) || defined (FG_HAVE_NATIVE_SGI_COMPILERS)
-  FG_USING_STD(getline);
+#if defined (_MSC_VER)
+  SG_USING_STD(getline);
 #endif
 
 // Constructor
-SGStarData::SGStarData() {
+SGStarData::SGStarData() :
+    nstars(0)
+{
 }
 
-SGStarData::SGStarData( FGPath path ) {
-    data_path = FGPath( path );
+SGStarData::SGStarData( SGPath path ) :
+    nstars(0)
+{
+    data_path = SGPath( path );
     load();
 }
 
@@ -50,15 +56,15 @@ bool SGStarData::load() {
 
     // -dw- avoid local data > 32k error by dynamic allocation of the
     // array, problem for some compilers
-    stars = new sgdVec3[SG_MAX_STARS];
+    stars = new SGVec3d[SG_MAX_STARS];
 
      // build the full path name to the stars data base file
     data_path.append( "stars" );
-    FG_LOG( FG_ASTRO, FG_INFO, "  Loading stars from " << data_path.str() );
+    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << data_path.str() );
 
-    fg_gzifstream in( data_path.str() );
+    sg_gzifstream in( data_path.str() );
     if ( ! in.is_open() ) {
-       FG_LOG( FG_ASTRO, FG_ALERT, "Cannot open star file: "
+       SG_LOG( SG_ASTRO, SG_ALERT, "Cannot open star file: "
                << data_path.str() );
        exit(-1);
     }
@@ -111,12 +117,12 @@ bool SGStarData::load() {
 
        // cout << " star data = " << ra << " " << dec << " " << mag << endl;
 
-       sgdSetVec3( stars[nstars], ra, dec, mag );
+       sgdSetVec3( stars[nstars].sg(), ra, dec, mag );
 
        ++nstars;
     }
 
-    FG_LOG( FG_ASTRO, FG_INFO, "  Loaded " << nstars << " stars" );
+    SG_LOG( SG_ASTRO, SG_INFO, "  Loaded " << nstars << " stars" );
 
     return true;
 }