[Gcblue-commits] gcb_wx/include/sim tcAeroAirObject.h,1.7,1.8 tcGameObject.h,1.32,1.33 tcLauncher.h,1.11,1.12

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

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

Modified Files:
	tcAeroAirObject.h tcGameObject.h tcLauncher.h 
Log Message:


Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tcGameObject.h	8 Mar 2005 00:41:47 -0000	1.32
--- tcGameObject.h	10 Mar 2005 03:28:27 -0000	1.33
***************
*** 113,119 ****
      float mfDamageLevel;       ///< 0 is no damage, up to toughness amount
  
!     float RangeTo(tcGameObject& p);
!     float BearingTo(tcGameObject& p);
!     float BearingToRad(tcGameObject& p);
      void AddChild(tcGameObject *child);
      void RemoveChild(tcGameObject *child);
--- 113,119 ----
      float mfDamageLevel;       ///< 0 is no damage, up to toughness amount
  
!     float RangeTo(tcGameObject& p) const;
!     float BearingTo(tcGameObject& p) const;
!     float BearingToRad(tcGameObject& p) const;
      void AddChild(tcGameObject *child);
      void RemoveChild(tcGameObject *child);

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcLauncher.h	24 Feb 2005 22:19:14 -0000	1.11
--- tcLauncher.h	10 Mar 2005 03:28:27 -0000	1.12
***************
*** 81,86 ****
  
      float mfTimeToReady;
!     unsigned int mnCurrent;
!     unsigned int mnUncommitted; ///< mnCurrent - mnUncommitted = # pending launch
      int errorCode; ///< used in multiplayer to pass error code to client
      bool isLoading; ///< true if launcher is offline to load/unload weapons
--- 81,86 ----
  
      float mfTimeToReady;
!     int mnCurrent;
!     int mnUncommitted; ///< mnCurrent - mnUncommitted = # pending launch
      int errorCode; ///< used in multiplayer to pass error code to client
      bool isLoading; ///< true if launcher is offline to load/unload weapons
***************
*** 112,115 ****
--- 112,116 ----
      tcUpdateStream& operator>>(tcUpdateStream& stream);
  
+     void ClearPendingLaunch();
      bool CommandInfoMatches(const tcLauncher& launcher);
      void CopyCommandInfoFrom(const tcLauncher& launcher);
***************
*** 119,122 ****
--- 120,124 ----
      int GetErrorCode() const {return errorCode;}
      int GetLauncherStatus();
+     int GetLauncherStatus() const;
      float GetSectorCenter() const; ///< returns center of engagement sector in radians
      float GetSectorWidth() const; ///< returns width of engagement sector in radians

Index: tcAeroAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcAeroAirObject.h	7 Nov 2004 03:40:43 -0000	1.7
--- tcAeroAirObject.h	10 Mar 2005 03:28:27 -0000	1.8
***************
*** 44,47 ****
--- 44,48 ----
      virtual void ApplyRestrictions();
      virtual void Clear(void);
+     virtual bool IsDestroyed();
      virtual void RandInitNear(float afLon_deg, float afLat_deg);