[Gcblue-commits] gcb_wx/include/database tcDatabase.h,1.11,1.12 tcMissileDBObject.h,1.20,1.21 tcSensorDBObject.h,1.10,1.11

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

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

Modified Files:
	tcDatabase.h tcMissileDBObject.h tcSensorDBObject.h 
Log Message:
Misc housekeeping, updates for infrared and anti-radiation seekers, more info for multiplayer airfield units, icon gui enhancements

Index: tcDatabase.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabase.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcDatabase.h	1 Jun 2005 00:13:25 -0000	1.11
--- tcDatabase.h	22 Jun 2005 01:21:25 -0000	1.12
***************
*** 75,79 ****
  		void BuildDictionaries();
  		void Clear();
- 		void CreateDefaultDB();
  		int CreateObjectCopy(tnPoolIndex anKey);
  		int CreateObjectByType(UINT anClassID);
--- 75,78 ----

Index: tcSensorDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorDBObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcSensorDBObject.h	1 Jun 2005 00:13:26 -0000	1.10
--- tcSensorDBObject.h	22 Jun 2005 01:21:26 -0000	1.11
***************
*** 45,49 ****
  		float mfScanPeriod_s;      ///< [s]
          bool isSurveillance;       ///< true if this sensor contributes reports to alliance map
! 
  		virtual tcSensorState* CreateSensor(tcGameObject* parent); ///< factory method
  		virtual const char* GetClassName() {return "Sensor";} ///< returns class name of database object
--- 45,49 ----
  		float mfScanPeriod_s;      ///< [s]
          bool isSurveillance;       ///< true if this sensor contributes reports to alliance map
! 	
  		virtual tcSensorState* CreateSensor(tcGameObject* parent); ///< factory method
  		virtual const char* GetClassName() {return "Sensor";} ///< returns class name of database object

Index: tcMissileDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcMissileDBObject.h	1 Jun 2005 00:13:26 -0000	1.20
--- tcMissileDBObject.h	22 Jun 2005 01:21:25 -0000	1.21
***************
*** 66,74 ****
     enum teGuidanceMode 
     {
!       GM_COMMAND = 0,  ///< command guidance
!       GM_NAV = 1,  ///< inertial, GPS
!       GM_SENSOR1 = 2, ///< use primary sensor
!       GM_SENSOR2 = 3, ///< use secondary sensor
!       GM_SENSORALL = 4   ///< use all sensors, not supported
     };
  
--- 66,72 ----
     enum teGuidanceMode 
     {
!        GM_COMMAND = 0,  ///< command guidance
!        GM_NAV = 1,  ///< inertial, GPS
!        GM_SENSOR1 = 2 ///< use seeker
     };
  
***************
*** 120,130 ****
  
        // other parameters
!       //float mfDamage;                     ///< damage value
!       //teDamageType meDamageType;          ///< damage type enumeration
        float mfRcs_dbsm;                   ///< radar cross section, [dBsm]
        float mfRange_km;                   ///< [km] nominal range
        // sensor info
!       tcDBString maSensorClass[2];        ///< primary and secondary
!       tnPoolIndex primarySeekerKey;       ///< key for fast access of primary seeker
        float seekerFOV_rad;                ///< for fast lookup of seeker field of view
        /// flight profile, array of flight segment info
--- 118,130 ----
  
        // other parameters
!       //float mfDamage;                   ///< damage value
!       //teDamageType meDamageType;        ///< damage type enumeration
        float mfRcs_dbsm;                   ///< radar cross section, [dBsm]
        float mfRange_km;                   ///< [km] nominal range
+ 
        // sensor info
!       tcDBString maSensorClass;           ///< seeker database class name
!       tnPoolIndex sensorKey;              ///< key for fast access of primary seeker
! 	  bool needsFireControl;              ///< true if seeker depends on a fire control sensor for guidance
        float seekerFOV_rad;                ///< for fast lookup of seeker field of view
        /// flight profile, array of flight segment info
***************
*** 135,141 ****
        bool IsLeaf() const; ///< returns true if db obj is a leaf obj
        teWeaponLaunchMode GetLaunchMode();
!       long GetPrimarySeekerKey();
        float GetSeekerFOV();
  	  bool HasAllEmitters(std::vector<long>& emitters);
        virtual void PrintToFile(tcFile& file);
        int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);
--- 135,142 ----
        bool IsLeaf() const; ///< returns true if db obj is a leaf obj
        teWeaponLaunchMode GetLaunchMode();
!       long GetSensorKey();
        float GetSeekerFOV();
  	  bool HasAllEmitters(std::vector<long>& emitters);
+ 	  bool NeedsFireControl() const;
        virtual void PrintToFile(tcFile& file);
        int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);