gcblue-commits

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

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

Modified Files:
	Game.h commandlist.h gcb.h tcAero.h tcAeroAirObject.h 
	tcAirObject.h tcAirfieldObject.h tcBallisticWeapon.h 
	tcCarrierObject.h tcCommandObject.h tcCommandQueue.h 
	tcControllableObject.h tcDemTileReader.h tcDirector.h 
	tcDirectorEvent.h tcESMSensor.h tcEngagementData.h 
	tcFlightOpsObject.h tcFlightPort.h tcGameObjIterator.h 
	tcGameObject.h tcGoal.h tcGroundObject.h tcGuidanceState.h 
	tcHeloObject.h tcLaunchRequest.h tcLauncher.h 
	tcLauncherState.h tcMapData.h tcMenu.h tcMissileObject.h 
	tcObjectControl.h tcOpticalSensor.h tcPlatformObject.h 
	tcPool.h tcPositionRegistry.h tcRadar.h tcSensorMap.h 
	tcSensorMapTrack.h tcSensorPlatform.h tcSensorState.h 
	tcSensorTrackIterator.h tcSimState.h tcSonar.h tcSonobuoy.h 
	tcStores.h tcSubObject.h tcSurfaceObject.h tcTime.h 
	tcTorpedoObject.h tcUserInfo.h tcUserSelectedGroups.h 
	tcWeaponObject.h 
Log Message:
Updates for vc8 compiler

Index: tcSubObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSubObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcSubObject.h	26 Jul 2005 00:37:03 -0000	1.10
--- tcSubObject.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 2,6 ****
  **  @file tcSubObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSubObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcTorpedoObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTorpedoObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcTorpedoObject.h	28 Jun 2005 02:51:20 -0000	1.5
--- tcTorpedoObject.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcTorpedoObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcTorpedoObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcMapData.h	28 Jun 2005 02:51:20 -0000	1.12
--- tcMapData.h	22 Mar 2006 01:23:29 -0000	1.13
***************
*** 6,10 ****
  **  Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html 
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 6,10 ----
  **  Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html 
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: gcb.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/gcb.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gcb.h	5 Jan 2006 03:47:22 -0000	1.11
--- gcb.h	22 Mar 2006 01:23:29 -0000	1.12
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcOpticalSensor.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcOpticalSensor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcOpticalSensor.h	1 Jun 2005 00:13:28 -0000	1.3
--- tcOpticalSensor.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcOpticalSensor.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcOpticalSensor.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcGroundObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGroundObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcGroundObject.h	31 Jan 2005 01:32:36 -0000	1.1
--- tcGroundObject.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcGroundObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcGroundObject.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSonar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSonar.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcSonar.h	7 Jul 2005 01:13:23 -0000	1.6
--- tcSonar.h	22 Mar 2006 01:23:29 -0000	1.7
***************
*** 2,6 ****
  **  @file tcSonar.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSonar.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcHeloObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcHeloObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcHeloObject.h	28 Jun 2005 02:51:20 -0000	1.3
--- tcHeloObject.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 2,6 ****
  **  @file tcHeloObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcHeloObject.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSensorTrackIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorTrackIterator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcSensorTrackIterator.h	1 Jun 2005 00:13:28 -0000	1.3
--- tcSensorTrackIterator.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 3,7 ****
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSensorMapTrack.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMapTrack.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSensorMapTrack.h	26 Jul 2005 00:37:03 -0000	1.4
--- tcSensorMapTrack.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 2,6 ****
  **  @file tcSensorMapTrack.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorMapTrack.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 108,111 ****
--- 108,112 ----
  	std::vector<long> engaged; ///< vector of weapon ids that are tracking / engaging
  	std::vector<long> ambiguityList; ///< vector of platform ids consistent with detected emitters
+ 
  	static unsigned int ambiguityListUpdates;
  

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcLauncher.h	18 Dec 2005 18:48:16 -0000	1.24
--- tcLauncher.h	22 Mar 2006 01:23:29 -0000	1.25
***************
*** 2,6 ****
  **  @file tcLauncher.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcLauncher.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **
***************
*** 128,131 ****
--- 128,133 ----
  	float GetCycleTime() const;
      short int GetErrorCode() const {return errorCode;}
+ 	unsigned GetFireControlTrackCount() const; ///< active FC tracks (0 if N/A)
+ 	unsigned GetMaxFireControlTracks() const; ///< max FC tracks (999 if N/A)
      int GetLauncherStatus();
  	tcGameObject* GetParent() const;

Index: tcCommandObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCommandObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcCommandObject.h	21 May 2005 02:00:28 -0000	1.4
--- tcCommandObject.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 1,5 ****
  /** @file tcCommandObject.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcCommandObject.h
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcLauncherState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcLauncherState.h	18 Dec 2005 18:48:16 -0000	1.18
--- tcLauncherState.h	22 Mar 2006 01:23:29 -0000	1.19
***************
*** 1,5 ****
  /** @file tcLauncherState.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcLauncherState.h
  **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcRadar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcRadar.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcRadar.h	27 Nov 2005 22:21:28 -0000	1.17
--- tcRadar.h	22 Mar 2006 01:23:29 -0000	1.18
***************
*** 2,7 ****
  **  @file tcRadar.h
  */
! /*
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcRadar.h
  */
! /*  Copyright (C) 2003-2006 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 30,33 ****
--- 29,33 ----
  #include "tcSensorState.h"
  #include "tcRadarDBObject.h"
+ #include <map>
  #include <vector>
  
***************
*** 63,67 ****
  {
  public:
!     tcRadarDBObject *mpDBObj;
  
      // fire-control vars
--- 63,67 ----
  {
  public:
!     tcRadarDBObject* mpDBObj;
  
      // fire-control vars
***************
*** 74,77 ****
--- 74,79 ----
  
      // fire control methods
+ 	unsigned GetFireControlTrackCount() const;
+ 	unsigned GetMaxFireControlTracks() const;
      virtual bool IsTrackAvailable();
      virtual bool RequestTrack();
***************
*** 85,88 ****
--- 87,94 ----
      void Serialize(tcFile& file, bool mbLoad);
  
+     void AddOrUpdateJammer(long id, float powerDensity, float az_rad);
+     bool IsJammed() const;
+     void RemoveJammer(long id);
+ 
      virtual bool IsRadar() const;
      virtual void Update(double t);
***************
*** 99,102 ****
--- 105,113 ----
  
  protected:
+     struct JamInfo
+     {
+         float powerDensity; ///< (Pj/Rj^2) [dB-W/km2]
+         float az_rad; ///< az of jammer
+     };
      bool isSemiactive;
      bool isCommandReceiver;
***************
*** 104,109 ****
  	float target_x_offset_m; ///< offset for seeker target point in model coords
  	float target_y_offset_m; ///< may want to move params like this to a seeker derived class
  
! 	void AdjustTrackForFineTargeting(const tcGameObject* target);
      void UpdateSeeker(double t);
      void UpdateSensorMap(double t, const tcGameObject* target, float range_km);
--- 115,129 ----
  	float target_x_offset_m; ///< offset for seeker target point in model coords
  	float target_y_offset_m; ///< may want to move params like this to a seeker derived class
+     std::map<long, JamInfo> jamMap;
+     float jamConstant;
+     float jammingDegradation_dB;
+     bool isJammed;
  
!     float CalculateJamConstant(); ///< (0.4*pi*Rref^4/Perp simple model assuming 10x jam to radar bw)
!     float CalculateJammingDegradation();
!     void RemoveAllJammers();
!     void UpdateJammingDegradation();
! 
!     void AdjustTrackForFineTargeting(const tcGameObject* target);
      void UpdateSeeker(double t);
      void UpdateSensorMap(double t, const tcGameObject* target, float range_km);

Index: tcFlightOpsObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightOpsObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcFlightOpsObject.h	10 Dec 2005 16:52:02 -0000	1.8
--- tcFlightOpsObject.h	22 Mar 2006 01:23:29 -0000	1.9
***************
*** 3,7 ****
  **  Header for tcFlightOpsObject class.
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 3,7 ----
  **  Header for tcFlightOpsObject class.
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcDemTileReader.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDemTileReader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcDemTileReader.h	24 Jun 2004 01:43:43 -0000	1.1
--- tcDemTileReader.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 4,8 ****
  **  Header for the tcDemTileReader.h class.
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 4,8 ----
  **  Header for the tcDemTileReader.h class.
  **
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** tcGameObject.h	12 Dec 2005 02:37:01 -0000	1.44
--- tcGameObject.h	22 Mar 2006 01:23:29 -0000	1.45
***************
*** 3,7 ****
  */
  /*
! **  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 3,7 ----
  */
  /*
! **  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcEngagementData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcEngagementData.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcEngagementData.h	17 Aug 2004 02:22:56 -0000	1.3
--- tcEngagementData.h	22 Mar 2006 01:23:29 -0000	1.4
***************
*** 1,4 ****
  /**  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcSonobuoy.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSonobuoy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcSonobuoy.h	1 Jun 2005 00:13:28 -0000	1.2
--- tcSonobuoy.h	22 Mar 2006 01:23:29 -0000	1.3
***************
*** 2,6 ****
  **  @file tcSonobuoy.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSonobuoy.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcFlightPort.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcFlightPort.h	11 Jun 2005 21:01:43 -0000	1.13
--- tcFlightPort.h	22 Mar 2006 01:23:29 -0000	1.14
***************
*** 1,4 ****
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAeroAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcAeroAirObject.h	11 Dec 2005 00:34:28 -0000	1.14
--- tcAeroAirObject.h	22 Mar 2006 01:23:29 -0000	1.15
***************
*** 1,4 ****
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,4 ----
  /*  
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcAirfieldObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirfieldObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcAirfieldObject.h	10 Dec 2005 16:52:02 -0000	1.4
--- tcAirfieldObject.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 2,6 ****
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  */
  /*
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcBallisticWeapon.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcBallisticWeapon.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcBallisticWeapon.h	1 Jun 2005 00:13:28 -0000	1.7
--- tcBallisticWeapon.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 1,5 ****
  /** @file tcBallisticWeapon.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,5 ----
  /** @file tcBallisticWeapon.h
  ** 
! **  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcGoal.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGoal.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcGoal.h	11 Dec 2005 00:34:28 -0000	1.7
--- tcGoal.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 2,6 ****
  **  @file tcGoal.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcGoal.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 44,48 ****
  }
  
! void InitGoalPython(boost::python::dict *dictionary);
  
  class tcGoal
--- 44,48 ----
  }
  
! void InitGoalPython();
  
  class tcGoal

Index: tcStores.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcStores.h	11 Dec 2005 00:34:28 -0000	1.7
--- tcStores.h	22 Mar 2006 01:23:29 -0000	1.8
***************
*** 2,6 ****
  **  @file tcStores.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 2,6 ----
  **  @file tcStores.h
  */
! /*  Copyright (C) 2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  **

Index: tcAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcAirObject.h	17 Apr 2005 22:35:00 -0000	1.14
--- tcAirObject.h	22 Mar 2006 01:23:29 -0000	1.15
***************
*** 2,6 ****
  **  @file tcAirObject.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcAirObject.h
  */
! /*  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcMenu.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMenu.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcMenu.h	18 Dec 2005 04:10:32 -0000	1.10
--- tcMenu.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 37,41 ****
  namespace osg
  {
! 	class ref_ptr;
  	class Geometry;
  }
--- 37,41 ----
  namespace osg
  {
! //	class ref_ptr;
  	class Geometry;
  }

Index: tcTime.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTime.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcTime.h	16 Apr 2005 20:43:56 -0000	1.9
--- tcTime.h	22 Mar 2006 01:23:29 -0000	1.10
***************
*** 1,4 ****
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /*  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcPositionRegistry.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPositionRegistry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcPositionRegistry.h	4 Mar 2005 00:46:15 -0000	1.1
--- tcPositionRegistry.h	22 Mar 2006 01:23:29 -0000	1.2
***************
*** 2,6 ****
  **  @file tcPositionRegistry.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcPositionRegistry.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcCarrierObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcCarrierObject.h	10 Dec 2005 16:52:02 -0000	1.13
--- tcCarrierObject.h	22 Mar 2006 01:23:29 -0000	1.14
***************
*** 1,4 ****
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
   *  All rights reserved.
   *
--- 1,4 ----
  /**
!  *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
   *  All rights reserved.
   *

Index: tcSensorPlatform.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorPlatform.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSensorPlatform.h	28 Jun 2005 02:51:20 -0000	1.5
--- tcSensorPlatform.h	22 Mar 2006 01:23:29 -0000	1.6
***************
*** 2,6 ****
  **  @file tcSensorPlatform.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSensorPlatform.h
  */
! /*  Copyright (C) 2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 59,63 ****
  	{
  		RADAR_ACTIVE = 1,
! 		ACTIVE_SONAR_ACTIVE = 2
  	};
  
--- 59,64 ----
  	{
  		RADAR_ACTIVE = 1,
! 		ACTIVE_SONAR_ACTIVE = 2,
!         ECM_ACTIVE = 4
  	};
  

Index: tcSurfaceObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSurfaceObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcSurfaceObject.h	28 Jun 2005 02:51:20 -0000	1.12
--- tcSurfaceObject.h	22 Mar 2006 01:23:29 -0000	1.13
***************
*** 1,4 ****
  /**  
! *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  *  All rights reserved.
  *
--- 1,4 ----
  /**  
! *  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  *  All rights reserved.
  *

Index: tcDirector.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirector.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcDirector.h	1 Jun 2005 00:13:28 -0000	1.10
--- tcDirector.h	22 Mar 2006 01:23:29 -0000	1.11
***************
*** 2,6 ****
  **  tcDirector.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  tcDirector.h
  **
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcObjectControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcObjectControl.h	2 Jan 2006 15:40:52 -0000	1.20
--- tcObjectControl.h	22 Mar 2006 01:23:29 -0000	1.21
***************
*** 2,6 ****
  **  @file tcObjectControl.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcObjectControl.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 95,99 ****
      BS_READY, ///< ready for immediate launch
      BS_ACTIVE, ///<  active but launch conditions not satisfied yet
!     BS_LOADING ///< loading item(s) into launcher
  };
  
--- 95,100 ----
      BS_READY, ///< ready for immediate launch
      BS_ACTIVE, ///<  active but launch conditions not satisfied yet
!     BS_LOADING, ///< loading item(s) into launcher
!     BS_WARN ///< used to indicate jamming or warning condition
  };
  

Index: tcGameObjIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObjIterator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcGameObjIterator.h	10 Dec 2005 16:52:02 -0000	1.4
--- tcGameObjIterator.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 1,5 ****
  /** @file tcGameObjIterator.h */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,5 ----
  /** @file tcGameObjIterator.h */
  /*
! **  Copyright (C) 2003 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 34,38 ****
  {
  public:
!     static SetSimState(tcSimState *ss) {simState = ss;}
  
      void First();
--- 34,38 ----
  {
  public:
!     static void SetSimState(tcSimState *ss) {simState = ss;}
  
      void First();

Index: tcCommandQueue.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCommandQueue.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcCommandQueue.h	18 Dec 2005 04:10:32 -0000	1.4
--- tcCommandQueue.h	22 Mar 2006 01:23:29 -0000	1.5
***************
*** 2,6 ****
  **  @file tcCommandQueue.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcCommandQueue.h
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** tcSimState.h	12 Dec 2005 03:20:29 -0000	1.45
--- tcSimState.h	22 Mar 2006 01:23:29 -0000	1.46
***************
*** 2,6 ****
  **  @file tcSimState.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcSimState.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 216,226 ****
      void EvaluateTorpedoHit(tcTorpedoObject* torp, tcGameObject* target);
      float GetFractionalDamage(float afDamage, tcGameObject *apGameObj);
-     bool IsDetectedESM(tcESMSensor* apESM, const tcRadar* apEmitterRadar, float& rfAz_rad);
      void PerformAutoEngage(tcGameObject* apGameObj, double afTime);
  	void PlayEntitySoundEffect(tcGameObject* obj, const std::string& effect);
      void ProcessRadarDetection(tcGameObject *apRadarPlat,tcGameObject *apTarget,
          tcRadar *apRadarSS);
-     void ProcessESMDetection(tcGameObject *apESMPlat,tcGameObject *apTarget,
-         tcESMSensor *apESMSS);
      void RegisterPlatform(tcGameObject* obj);
  	void UnregisterPlatform(tcGameObject* obj);
--- 216,223 ----

Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Game.h	5 Jan 2006 03:47:22 -0000	1.65
--- Game.h	22 Mar 2006 01:23:29 -0000	1.66
***************
*** 1,6 ****
  /** 
! ** @file Game.h
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
--- 1,6 ----
  /** 
! **  @file Game.h
  */
! /*  Copyright (C) 2003-2006 Dewitt Colclough (de...@gc...)
  **  All rights reserved.
  
***************
*** 213,217 ****
  
      int mbPaused;
!     bool mbQuit; ///< set to true to exit game
      bool mbScenarioEdit; ///< scenario edit mode
      int accelerateTime; ///< time acceleration factor, 0 is no accel, 1 is 2x, 2 is 3x, etc
--- 213,218 ----
  
      int mbPaused;
!     bool mbQuit; ///< set to true to exit game to desktop
! 	bool endGame; ///< set to true to exit game to start screen
      bool mbScenarioEdit; ///< scenario edit mode
      int accelerateTime; ///< time acceleration factor, 0 is no accel, 1 is 2x, 2 is 3x, etc
***************
*** 261,265 ****
  	void OnNcPaint(wxNcPaintEvent& event);
      void OnPaint(wxPaintEvent& event);
!     void OnRButtonDown(wxMouseEvent& event);   
  	void ProcessCallback(tsCommandInfo& cmd); ///< for python interface
      void ProcessCommandList();
--- 262,266 ----
  	void OnNcPaint(wxNcPaintEvent& event);
      void OnPaint(wxPaintEvent& event);
!     void OnRButtonDown(wxMouseEvent& event);
  	void ProcessCallback(tsCommandInfo& cmd); ///< for python interface
      void ProcessCommandList();
***************
*** 278,281 ****
--- 279,283 ----
      void SetTimeAccel(wxCommandEvent& event);
      void ShiftTime(float delta_s); ///< shifts...
 
[truncated message content]