[Gcblue-commits] gcb_wx/src/common simmath.cpp,1.25,1.26 tcStream.cpp,1.10,1.11

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

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2354/src/common

Modified Files:
	simmath.cpp tcStream.cpp 
Log Message:
Misc housekeeping, updates for infrared and anti-radiation seekers, more info for multiplayer airfield units, icon gui enhancements

Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** simmath.cpp	6 May 2005 23:57:49 -0000	1.25
--- simmath.cpp	22 Jun 2005 01:22:04 -0000	1.26
***************
*** 23,28 ****
--- 23,30 ----
  #include "simmath.h"
  #include "nsNav.h"
+ #include "tcMapData.h"
  #include "common/tcStream.h"
  
+ 
  void ConformLonLatRad(float &lon_rad, float &lat_rad) {
     if (lon_rad < -C_PI) {lon_rad = -C_PI;}
***************
*** 328,331 ****
--- 330,343 ----
          return 1000.0f;
      }
+ 	else if (mnClassification & PTYPE_FIXED)
+ 	{
+ 		float terrain_height_m =
+ 			tcMapData::Get()->GetTerrainHeight(C_180OVERPI*mfLon_rad, C_180OVERPI*mfLat_rad, mfTimestamp);
+ 		return terrain_height_m + 5.0f;
+ 	}
+ 	else if (mnClassification & PTYPE_SUBSURFACE)
+ 	{
+ 		return -20.0f;
+ 	}
      else
      {
***************
*** 422,425 ****
--- 434,460 ----
  }
  
+ /**
+ * copy track
+ */
+ tcTrack& tcTrack::operator==(const tcTrack& src)
+ {
+     mfLon_rad = src.mfLon_rad;
+     mfLat_rad = src.mfLat_rad;
+     mfAlt_m = src.mfAlt_m;
+     mfSpeed_kts = src.mfSpeed_kts;
+     mfHeading_rad = src.mfHeading_rad;
+     mfClimbAngle_rad = src.mfClimbAngle_rad;
+     bearingRate_radps = src.bearingRate_radps;
+     mfTimestamp = src.mfTimestamp;
+     mnID = src.mnID;
+     mnPassivePlatformID = src.mnPassivePlatformID;
+     mnClassification = src.mnClassification;
+     mnAffiliation = src.mnAffiliation;
+     mnAlliance = src.mnAlliance;
+     mnFlags = src.mnFlags;
+ 
+ 	return *this;
+ }
+ 
  /******************************* tcTerrainInfo *******************************/
  void tcTerrainInfo::Clear() {

Index: tcStream.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcStream.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcStream.cpp	5 May 2005 02:14:51 -0000	1.10
--- tcStream.cpp	22 Jun 2005 01:22:07 -0000	1.11
***************
*** 173,176 ****
--- 173,182 ----
  }
  
+ tcStream& tcStream::operator<<(unsigned long& val)
+ {
+     write((char*)&val, sizeof(val));   
+     return *this;
+ }
+ 
  tcStream& tcStream::operator<<(bool& val)
  {
***************
*** 252,255 ****
--- 258,267 ----
  }
  
+ tcStream& tcStream::operator>>(unsigned long& val)
+ {
+     read((char*)&val, sizeof(val));   
+     return *this;
+ }
+ 
  tcStream& tcStream::operator>>(bool& val)
  {