[Gcblue-commits] gcb_wx/include/sim tcSubObject.h,1.7,1.8

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5550/include/sim

Modified Files:
	tcSubObject.h 
Log Message:
Diesel-electric battery and snorkeling

Index: tcSubObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSubObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcSubObject.h	7 Jul 2005 01:13:23 -0000	1.7
--- tcSubObject.h	10 Jul 2005 20:32:02 -0000	1.8
***************
*** 58,69 ****
--- 58,73 ----
      virtual void Serialize(tcFile& file, bool mbLoad);
  
+ 	float GetBatteryCharge() const;
      float GetPeriscopeDepth() const;
      bool GetPeriscopeState() const;
      bool GetRadarMastState() const;
+ 	bool GetSnorkelState() const;
      virtual float GetSonarSourceLevel() const;
      bool IsAtPeriscopeDepth() const;
+ 	bool IsDieselElectric() const;
      bool IsSurfaced() const;
      void SetPeriscopeState(bool state);
      void SetRadarMastState(bool state);
+ 	void SetSnorkelState(bool state);
  
      virtual tcCommandStream& operator<<(tcCommandStream& stream);
***************
*** 85,92 ****
--- 89,98 ----
      bool radarMastRaised;
      bool periscopeRaised;
+ 	bool isSnorkeling; ///< true if diesel generator active and snorkeling (DE subs only)
      float periscopeDepth_m; ///< periscope depth (positive number)
      float invPeriscopeDepth; ///< 1/periscopeDepth_m
      float lastDepth_m; ///< for depth notification messages
      bool doneSinking;
+ 	float batteryCharge; ///< current battery charge (DE subs only)
  
      void UpdateDestroyed(double t);