[Gcblue-commits] gcb_wx/include/sim tcFlightOpsObject.h, 1.10, 1.11 tcFlightPort.h, 1.17, 1.18 tcHeloObject.h, 1.5, 1.6 tcSonar.h, 1.7, 1.8

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

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

Modified Files:
	tcFlightOpsObject.h tcFlightPort.h tcHeloObject.h tcSonar.h 
Log Message:


Index: tcFlightPort.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcFlightPort.h	24 Oct 2006 01:34:01 -0000	1.17
--- tcFlightPort.h	27 Nov 2006 00:46:24 -0000	1.18
***************
*** 82,86 ****
  	double ready_time; // time for op to be completed
  	tcGameObject *obj;
! 
  	tcUpdateStream& operator<<(tcUpdateStream& stream);
  	tcUpdateStream& operator>>(tcUpdateStream& stream);
--- 82,87 ----
  	double ready_time; // time for op to be completed
  	tcGameObject *obj;
!     
!     unsigned int lastMultiplayerUpdate; // for multiplayer client
  	tcUpdateStream& operator<<(tcUpdateStream& stream);
  	tcUpdateStream& operator>>(tcUpdateStream& stream);
***************
*** 188,191 ****
--- 189,194 ----
  	std::vector<CommandInfo> commandList;
  	ai::tcMissionManager* missionManager;
+     size_t nextUpdateIdx; ///< to track partial updates on multiplayer server
+ 
  
  	teLocation GetNextStop(teLocation current, teLocation destination);
***************
*** 193,196 ****
--- 196,200 ----
  	bool IsSpotEmpty(teLocation loc, unsigned int spot);
  	void ResyncSpots();
+     void RemoveStaleUnits();
  };
  

Index: tcFlightOpsObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightOpsObject.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcFlightOpsObject.h	27 Mar 2006 01:08:30 -0000	1.10
--- tcFlightOpsObject.h	27 Nov 2006 00:46:24 -0000	1.11
***************
*** 71,74 ****
--- 71,75 ----
      virtual void Clear();
      tcFlightPort* GetFlightPort();
+     size_t CurrentAirComplementSize() const;
  	tcTrack GetLandingData();
      void PrintToFile(tcFile& file);
***************
*** 100,103 ****
--- 101,106 ----
  	tcGameObject* gameObj; ///< to avoid (some) virtual inheritance inefficiency
  
+     size_t nextUpdateIdx; ///< to track partial updates on multiplayer server
+ 
      tcFlightOpsObject();
  };

Index: tcHeloObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcHeloObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcHeloObject.h	20 Nov 2006 00:16:29 -0000	1.5
--- tcHeloObject.h	27 Nov 2006 00:46:24 -0000	1.6
***************
*** 45,48 ****
--- 45,51 ----
      virtual void Update(double afStatusTime);
  
+     float GetDippingSonarAlt() const;
+     virtual float GetSonarSourceLevel() const;
+ 
      void PrintToFile(tcFile& file);
      void SaveToFile(tcFile& file);

Index: tcSonar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSonar.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcSonar.h	22 Mar 2006 01:23:29 -0000	1.7
--- tcSonar.h	27 Nov 2006 00:46:24 -0000	1.8
***************
*** 60,63 ****
--- 60,64 ----
      void Serialize(tcFile& file, bool mbLoad);
  
+     float GetScope() const;
      bool IsPassive() const; ///< Warning: don't confuse with !tcSensorState::IsActive()
      virtual bool IsRadar() const;
***************
*** 92,95 ****
--- 93,97 ----
      float last_range_km; ///< [km] target range from last call to CanDetectTarget
      float last_snr_excess; ///< [dB] snr excess from last call to CanDetectTarget
+     long emitterId; ///< if active sonar has been detected, database id of active sonar, -1 otherwise
  };