[Gcblue-commits] gcb_wx/src/common simmath.cpp,1.17,1.18 tcOptions.cpp,1.12,1.13

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

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

Modified Files:
	simmath.cpp tcOptions.cpp 
Log Message:
Added optical sensor model, fixed generic model display for sensor tracks

Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** simmath.cpp	29 Oct 2004 02:50:43 -0000	1.17
--- simmath.cpp	6 Nov 2004 15:13:41 -0000	1.18
***************
*** 312,315 ****
--- 312,335 ----
  }
  
+ /**
+ * @returns track altitude or default based on classification if not avail
+ */
+ float tcTrack::GetOrGuessAltitude() const
+ {
+     if (mnFlags & TRACK_ALT_VALID)
+     {
+         return mfAlt_m;
+     }
+     else if (mnClassification & (PTYPE_AIR | PTYPE_MISSILE))
+     {
+         return 1000.0f;
+     }
+     else
+     {
+         return 0;
+     }
+ }
+ 
+ 
  void tcTrack::GetPrediction(tcTrack& td, double afTime)
  {
***************
*** 368,371 ****
--- 388,396 ----
  }
  
+ bool tcTrack::IsBearingOnly() const
+ {
+     return (mnFlags & TRACK_BEARING_ONLY) != 0;
+ }
+ 
  /******************************* tcTerrainInfo *******************************/
  void tcTerrainInfo::Clear() {

Index: tcOptions.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptions.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcOptions.cpp	1 Nov 2004 03:17:17 -0000	1.12
--- tcOptions.cpp	6 Nov 2004 15:13:41 -0000	1.13
***************
*** 131,134 ****
--- 131,144 ----
     AddOption(oi);
  
+    oi.meType = tsOptionInfo::OT_RADIOBUTTON;
+    oi.mnStateCount = 4;
+    oi.mnValue = 1;
+    oi.mpAssociated = &mn3DCheatMode;
+    oi.mzCaption[0] = "Own-alliance 3D only";
+    oi.mzCaption[1] = "Track 3D";
+    oi.mzCaption[2] = "Track 3D+";
+    oi.mzCaption[3] = "Cheat";
+    AddOption(oi);
+ 
     Serialize(true); // read option state from file (options.dat)