[Gcblue-commits] gcb_wx/include/database tcMissileDBObject.h,1.8,1.9 tcRadarDBObject.h,1.7,1.8

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

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

Modified Files:
	tcMissileDBObject.h tcRadarDBObject.h 
Log Message:


Index: tcRadarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcRadarDBObject.h	28 Mar 2004 23:12:27 -0000	1.7
--- tcRadarDBObject.h	19 Jul 2004 00:52:26 -0000	1.8
***************
*** 45,49 ****
        bool mbDetectsSurface;     ///< set true if detects surface targets
        bool mbDetectsAir;         ///< set true if detects airborne targets
!       float mfGrowth[8];           ///< growth fields (TODO delete, but make sure nothing breaks!)
  
        virtual const char* GetClassName() {return "Radar";} ///< returns class name of database object
--- 45,49 ----
        bool mbDetectsSurface;     ///< set true if detects surface targets
        bool mbDetectsAir;         ///< set true if detects airborne targets
! 	  bool mbDetectsGround;      ///< set true if detects ground targets
  
        virtual const char* GetClassName() {return "Radar";} ///< returns class name of database object

Index: tcMissileDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcMissileDBObject.h	28 Mar 2004 23:12:27 -0000	1.8
--- tcMissileDBObject.h	19 Jul 2004 00:52:26 -0000	1.9
***************
*** 33,50 ****
  namespace Database
  {
! 
!    typedef enum _damagetype 
     {
        DT_GENERIC
!    } teDamageType;
  
!    typedef enum _altitudemode 
     {
!       AM_ASL,  ///< sea level reference
!       AM_AGL,  ///< terrain reference (altimeter)
!       AM_INTERCEPT   ///< set altitude to intercept if locked on
!    } teAltitudeMode;
  
!    typedef enum _guidancemode 
     {
        GM_COMMAND = 0,  ///< command guidance
--- 33,65 ----
  namespace Database
  {
!    /**
!    * This isn't used currently. Notionally there will be different
!    * damage types that have varying effectiveness vs. different
!    * target types.
!    */
!    enum teDamageType 
     {
        DT_GENERIC
!    };
  
!    /**
!    * teAltitudeMode determines how altitude is controlled for flight segment.
!    */
!    enum teAltitudeMode 
     {
! 	   /// sea level reference
! 	   AM_ASL = 0, 
! 	   /// terrain reference (altimeter)
! 	   AM_AGL = 1,  
! 	   /// set altitude to intercept if seeker has track, otherwise maintain altitude
! 	   AM_INTERCEPT = 2,
! 	   /// set altitude to impact datum
! 	   AM_DATUM = 3
!    };
  
!    /**
!    * teGuidanceMode determines guidance type that is used flight segment.
!    */
!    enum teGuidanceMode 
     {
        GM_COMMAND = 0,  ///< command guidance
***************
*** 53,59 ****
        GM_SENSOR2 = 3, ///< use secondary sensor
        GM_SENSORALL = 4   ///< use all sensors, not supported
!    } teGuidanceMode;
  
!    typedef struct _missileflightsegment 
     {
        float mfRange_km;    ///< min range for this segment
--- 68,77 ----
        GM_SENSOR2 = 3, ///< use secondary sensor
        GM_SENSORALL = 4   ///< use all sensors, not supported
!    };
  
!    /**
!    * Info that controls missile behavior for flight segment.
!    */
!    struct tsMissileFlightSegment 
     {
        float mfRange_km;    ///< min range for this segment
***************
*** 61,68 ****
        teAltitudeMode meAltitudeMode;   ///< altitude mode 
        teGuidanceMode meGuidanceMode;   ///< guidance mode 
!    } tsMissileFlightSegment;
  
  #define MAX_MISSILE_FLIGHT_SEGMENTS 8
  
     enum teWeaponLaunchMode 
     {
--- 79,89 ----
        teAltitudeMode meAltitudeMode;   ///< altitude mode 
        teGuidanceMode meGuidanceMode;   ///< guidance mode 
!    };
  
  #define MAX_MISSILE_FLIGHT_SEGMENTS 8
  
+    /**
+    * Requirements for weapon launch
+    */
     enum teWeaponLaunchMode 
     {