[Gcblue-commits] gcb_wx/include/sim commandlist.h,1.9,1.10 tcAirfieldObject.h,1.3,1.4 tcCarrierObject.h,1.12,1.13 tcFlightOpsObject.h,1.7,1.8 tcGameObjIterator.h,1.3,1.4 tcGameObject.h,1.42,1.43 tcSensorMap.h,1.15,1.16 tcSimState.h,1.43,1.44

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

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

Modified Files:
	commandlist.h tcAirfieldObject.h tcCarrierObject.h 
	tcFlightOpsObject.h tcGameObjIterator.h tcGameObject.h 
	tcSensorMap.h tcSimState.h 
Log Message:
Start of save to python feature

Index: tcSensorMap.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMap.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcSensorMap.h	1 Jun 2005 00:13:28 -0000	1.15
--- tcSensorMap.h	10 Dec 2005 16:52:02 -0000	1.16
***************
*** 101,104 ****
--- 101,105 ----
  	tcAllianceSensorMap* GetOrCreateMap(UINT8 alliance);
  	void CreateMapForAlliance(UINT8 anAlliance);
+ 	bool MapExists(UINT8 alliance) const;
  
  	bool AddReport(const tcSensorReport& report, UINT8 anAlliance);  

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** tcSimState.h	26 Jul 2005 00:37:03 -0000	1.43
--- tcSimState.h	10 Dec 2005 16:52:02 -0000	1.44
***************
*** 173,176 ****
--- 173,177 ----
      void RequestLaunch(long anKey,int anLauncher);
      void SaveTimeToStream(tcStream& stream);
+ 	void SaveToPython(const std::string& scenarioName);
      int Serialize(tcString scenname, bool mbLoad);
      void SetDateTime(DateZulu dz) {dateZulu = dz;} ///< Sets DateZulu object for environment date (sky, etc)

Index: tcAirfieldObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirfieldObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcAirfieldObject.h	29 Apr 2005 18:52:02 -0000	1.3
--- tcAirfieldObject.h	10 Dec 2005 16:52:02 -0000	1.4
***************
*** 31,34 ****
--- 31,39 ----
  #include "tcFlightOpsObject.h"
  
+ namespace scriptinterface
+ {
+ 	class tcScenariologger;
+ }
+ 
  class tcStream;
  class tcCommandStream;
***************
*** 52,55 ****
--- 57,61 ----
      void LoadFromFile(tcFile& file);
      virtual void Serialize(tcFile& file, bool mbLoad);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual void Update(double afStatusTime);

Index: tcGameObjIterator.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObjIterator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcGameObjIterator.h	17 Aug 2004 02:22:56 -0000	1.3
--- tcGameObjIterator.h	10 Dec 2005 16:52:02 -0000	1.4
***************
*** 40,43 ****
--- 40,44 ----
      void Next();
      bool NotDone();
+ 	void SetAllianceFilter(unsigned alliance_);
  
      tcGameObjIterator(const tcGeoRect& filterRegion);
***************
*** 54,57 ****
--- 55,59 ----
      unsigned nIterated; ///< count of elements iterated
      unsigned nSize; ///< size of list
+ 	unsigned allianceFilter; ///< filter by alliance if non-zero
  
      bool PassesFilter(const tcGameObject *obj);

Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** tcGameObject.h	27 Nov 2005 22:21:28 -0000	1.42
--- tcGameObject.h	10 Dec 2005 16:52:02 -0000	1.43
***************
*** 48,51 ****
--- 48,56 ----
  }
  
+ namespace scriptinterface
+ {
+ 	class tcScenarioLogger;
+ }
+ 
  class tcSimState;
  class tcStream;
***************
*** 156,159 ****
--- 161,165 ----
      virtual void LoadFromFile(tcFile& file); 
      virtual void Serialize(tcFile& file, bool mbLoad);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
      virtual void Update(double afStatusTime) {}
      virtual void UpdateCaptivePosition();

Index: commandlist.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/commandlist.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** commandlist.h	27 Nov 2005 22:21:28 -0000	1.9
--- commandlist.h	10 Dec 2005 16:52:02 -0000	1.10
***************
*** 47,50 ****
--- 47,51 ----
     GC_SHOWBRIEFING,
     GC_SHOWMISSIONSTATUS,
+    GC_SAVEGAME,
     PC_GETNEWHEADING,
     PC_CHANGEHEADING,

Index: tcFlightOpsObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightOpsObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcFlightOpsObject.h	2 Jul 2005 16:51:09 -0000	1.7
--- tcFlightOpsObject.h	10 Dec 2005 16:52:02 -0000	1.8
***************
*** 43,46 ****
--- 43,50 ----
  	class tcDatabase;
  }
+ namespace scriptinterface
+ {
+ 	class tcScenarioLogger;
+ }
  class tcTrack;
  
***************
*** 75,78 ****
--- 79,84 ----
      virtual void UpdateLaunch();
  
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
+ 
      virtual tcCommandStream& operator<<(tcCommandStream& stream);
      virtual tcCreateStream& operator<<(tcCreateStream& stream);

Index: tcCarrierObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcCarrierObject.h	29 Apr 2005 18:52:02 -0000	1.12
--- tcCarrierObject.h	10 Dec 2005 16:52:02 -0000	1.13
***************
*** 33,36 ****
--- 33,40 ----
  class tcCreateStream;
  class tcUpdateStream;
+ namespace scriptinterface
+ {
+ 	class tcScenariologger;
+ }
  
  /**
***************
*** 53,56 ****
--- 57,61 ----
      void LoadFromFile(tcFile& file);
      virtual void Serialize(tcFile& file, bool mbLoad);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual void Update(double afStatusTime);