Fix a bug in cloud texture state loading which caused the cloud textures to

[simgear.git] / simgear / timing / sg_time.hxx

diff --git a/simgear/timing/sg_time.hxx b/simgear/timing/sg_time.hxx
index 800394de3c0f8a8913ebf0398198615c77824475..fa0ab060722e789736a73dc8aa7018298ed017ae 100644 (file)
--- a/simgear/timing/sg_time.hxx
+++ b/simgear/timing/sg_time.hxx
@@ -72,7 +72,7 @@ private:
     TimezoneContainer* tzContainer;
 
     // Points to the current local timezone name;
-    char *zonename;
+    string zonename;
 
     // Unix "calendar" time in seconds
     time_t cur_time;
@@ -125,7 +125,7 @@ public:
      * @param root root path point to data file location (timezone, etc.)
      * @param init_time provide an initialization time, 0 means use
               current clock time */
-    SGTime( double lon, double lat, const string& root, time_t init_time = 0 );
+    SGTime( double lon, double lat, const string& root, time_t init_time /* = 0 */ );
 
     /**
      * Create an instance given a data file path.
@@ -136,6 +136,9 @@ public:
     /** Destructor */
     ~SGTime();
 
+    /** init common constructor code */
+    void init( double lon, double lat, const string& root, time_t init_time /* = 0 */ );
+
     /** 
      * Update the time related variables.
      * The update() method requires you to pass in your position and
@@ -149,7 +152,7 @@ public:
               clock time
      * @param warp an optional time offset specified in seconds.  This
      *        allows us to advance or rewind "time" if we choose to.  */
-    void update( double lon, double lat, time_t ct = 0, long int warp = 0 );
+    void update( double lon, double lat, time_t ct /* = 0 */, long int warp /* = 0 */ );
 
     /**
      * Given lon/lat, update timezone information and local_offset
@@ -167,7 +170,7 @@ public:
     inline time_t get_cur_time() const { return cur_time; };
 
     /** @return time zone name for your current position*/
-    inline char* get_zonename() const { return zonename; }
+    inline const char * get_zonename() const { return zonename.c_str(); }
 
     /** @return GMT in a "brokent down" tm structure */
 #if defined(_MSC_VER) || defined(__MINGW32__)
@@ -244,7 +247,7 @@ double sgTimeCalcMJD(int mn, double dy, int yr);
  * @param warp number of seconds to offset from current time (0 if no offset)
  * @return current modified Julian date (number of days elapsed
  * since 1900 jan 0.5), mjd. */
-double sgTimeCurrentMJD( time_t ct = 0, long int warp = 0 );
+double sgTimeCurrentMJD( time_t ct /* = 0 */, long int warp /* = 0 */ );
 
 /**
  * \relates SGTime