[Gcblue-commits] gcb_wx/include/sim tcAirObject.h,1.12,1.13 tcGameObject.h,1.31,1.32 tcSimState.h,1.34,1.35 tcSubObject.h,1.2,1.3 tcSurfaceObject.h,1.9,1.10

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

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

Modified Files:
	tcAirObject.h tcGameObject.h tcSimState.h tcSubObject.h 
	tcSurfaceObject.h 
Log Message:


Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tcGameObject.h	24 Feb 2005 22:19:14 -0000	1.31
--- tcGameObject.h	8 Mar 2005 00:41:47 -0000	1.32
***************
*** 138,141 ****
--- 138,142 ----
      virtual bool HasNewCommand() const;
      virtual bool HasUnacknowledgedCommand() const;
+     virtual bool IsDestroyed();
  
      virtual void LoadFromFile(tcFile& file); 

Index: tcSubObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSubObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSubObject.h	2 Dec 2004 04:17:24 -0000	1.2
--- tcSubObject.h	8 Mar 2005 00:41:47 -0000	1.3
***************
*** 44,47 ****
--- 44,48 ----
      virtual void ApplyRestrictions();
      virtual void Clear();
+     virtual bool IsDestroyed();
      virtual void RandInitNear(float afLon_deg, float afLat_deg);
      virtual void UpdateClimb(float dt_s);
***************
*** 82,86 ****
--- 83,89 ----
      float periscopeDepth_m; ///< periscope depth (positive number)
      float lastDepth_m; ///< for depth notification messages
+     bool doneSinking;
  
+     void UpdateDestroyed(double t);
      virtual void UpdateEffects();
      virtual void UpdateHeading(float dt_s);

Index: tcAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcAirObject.h	7 Nov 2004 03:40:43 -0000	1.12
--- tcAirObject.h	8 Mar 2005 00:41:47 -0000	1.13
***************
*** 51,55 ****
  
      virtual void ApplyRestrictions();
!     virtual void Clear(void);
      virtual void RandInitNear(float afLon_deg, float afLat_deg);
      virtual void SetLandingState(int state);
--- 51,56 ----
  
      virtual void ApplyRestrictions();
!     virtual void Clear();
!     virtual bool IsDestroyed();
      virtual void RandInitNear(float afLon_deg, float afLat_deg);
      virtual void SetLandingState(int state);
***************
*** 80,87 ****
--- 81,90 ----
      tcCommandObject commandObj;
  
+     virtual void UpdateDestroyed(double t);
      virtual void UpdateEffects();
      virtual void UpdateHeading(float dt_s);
      virtual void UpdateSpeed(float dt_s);
      float maxPitch_rad; ///< user imposed restriction to pitch angle
+     bool doneCrashing;
  };
  

Index: tcSurfaceObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSurfaceObject.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcSurfaceObject.h	17 Aug 2004 02:22:56 -0000	1.9
--- tcSurfaceObject.h	8 Mar 2005 00:41:48 -0000	1.10
***************
*** 45,49 ****
     tcGenericDBObject *mpDBObject;
     
!    virtual void Clear(void);
     virtual void RandInitNear(float afLon_deg, float afLat_deg);
     virtual void Update(double afStatusTime);
--- 45,50 ----
     tcGenericDBObject *mpDBObject;
     
!    virtual void Clear();
!    virtual bool IsDestroyed();
     virtual void RandInitNear(float afLon_deg, float afLat_deg);
     virtual void Update(double afStatusTime);
***************
*** 64,67 ****
--- 65,71 ----
     virtual void ApplyRestrictions(void);
     virtual void UpdateClimb(float dt_s) {} // do nothing for surface objs
+    virtual void UpdateDestroyed(double t);
+ 
+    bool doneSinking;
  };
  

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** tcSimState.h	2 Mar 2005 22:28:40 -0000	1.34
--- tcSimState.h	8 Mar 2005 00:41:47 -0000	1.35
***************
*** 150,154 ****
      tcGameObject* GetObject(tnPoolIndex anKey);
      tcGameObject* GetObjectByName(const std::string& unitName);
!     int GetPlatformsWithinRegion(tnPoolIndex *apKeyList, int anLength, tcRect *apRegion);
      long GetRandomPlatform();
      int GetSeekerTrack(long anKey, tcTrack& track);
--- 150,154 ----
      tcGameObject* GetObject(tnPoolIndex anKey);
      tcGameObject* GetObjectByName(const std::string& unitName);
!     void GetPlatformsWithinRegion(std::vector<long>& keyList, tcRect *apRegion);
      long GetRandomPlatform();
      int GetSeekerTrack(long anKey, tcTrack& track);