[Gcblue-commits] gcb_wx/src/scriptinterface tcPlatformInterface.cpp,1.22,1.23

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

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

Modified Files:
	tcPlatformInterface.cpp 
Log Message:


Index: tcPlatformInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterface.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcPlatformInterface.cpp	24 May 2004 00:14:47 -0000	1.22
--- tcPlatformInterface.cpp	29 May 2004 00:11:53 -0000	1.23
***************
*** 203,210 ****
      }
  
!     float tcPlatformInterface::GetRangeToTarget() {
!         tcGameObject* pGameObj = GetTargetObj();
!         if (pGameObj == NULL) {return 0;}
!         return mpPlatformObj->RangeTo(*pGameObj);
      }   
  
--- 203,214 ----
      }
  
!     float tcPlatformInterface::GetRangeToTarget() 
!     {
!         tcSensorMapTrack track;
!         if (!GetTargetTrack(track))
!         {
!             return 0;
!         }
!         return mpPlatformObj->mcKin.RangeToKm(track);
      }   
  
***************
*** 213,220 ****
      {
          tcGameObject* pGameObj = GetTargetObj();
-         if (pGameObj == NULL) {return false;} // target not found, do nothing
  
!         // return truth data if own alliance
!         if (mpSimState->mpUserInfo->IsOwnAlliance(pGameObj->mnAlliance)) 
          {
              tcKinematics *pTargetKin = &pGameObj->mcKin;
--- 217,225 ----
      {
          tcGameObject* pGameObj = GetTargetObj();
  
!         /* return truth data if obj found and own alliance
!         ** On client machine, only own-alliance objects exist in sim state
!         */
!         if (pGameObj && (mpSimState->mpUserInfo->IsOwnAlliance(pGameObj->mnAlliance)))
          {
              tcKinematics *pTargetKin = &pGameObj->mcKin;
***************
*** 231,238 ****
              return true;
          }
!         else 
          {
              tcSensorMapTrack *smtrack = 
!                 mpSimState->mcSensorMap.GetSensorMapTrack(pGameObj->mnID,mpPlatformObj->mnAlliance);
              if (smtrack)
              {
--- 236,243 ----
              return true;
          }
!         else // check for sensor track
          {
              tcSensorMapTrack *smtrack = 
!                 mpSimState->mcSensorMap.GetSensorMapTrack(GetTarget(), mpPlatformObj->mnAlliance);
              if (smtrack)
              {
***************
*** 251,261 ****
  
  
!     bool tcPlatformInterface::IsLauncherEffective(int anLauncher) {
          tcLauncherInfo info;
!         if (GetLauncherInfo(info, anLauncher) == false) {
              return false;
          }
          tcSensorMapTrack track;
!         if (GetTargetTrack(track) == false) {
              return false;
          }
--- 256,269 ----
  
  
!     bool tcPlatformInterface::IsLauncherEffective(int anLauncher) 
!     {
          tcLauncherInfo info;
!         if (GetLauncherInfo(info, anLauncher) == false) 
!         {
              return false;
          }
          tcSensorMapTrack track;
!         if (GetTargetTrack(track) == false) 
!         {
              return false;
          }
***************
*** 324,345 ****
          best.mfRange_km = 0;
  
!         tcGameObject* pGameObj = GetTargetObj();
!         if (pGameObj == NULL) {return best;}
  
          // get range to target
!         float mfTargetRange = mpPlatformObj->RangeTo(*pGameObj);
  
          // set target type
          int nTargetType;
!         if (dynamic_cast<tcSurfaceObject*>(pGameObj)) {
              nTargetType = SURFACE_TARGET;
          }
!         else if (dynamic_cast<tcAirObject*>(pGameObj)) {
              nTargetType = AIR_TARGET;
          }
!         else if (dynamic_cast<tcMissileObject*>(pGameObj)) {
              nTargetType = MISSILE_TARGET;
          }
!         else {
              nTargetType = 0; // error, unknown target type
          }
--- 332,358 ----
          best.mfRange_km = 0;
  
!         tcSensorMapTrack track;
!         if (!GetTargetTrack(track)) {return best;}
  
          // get range to target
!         float mfTargetRange = mpPlatformObj->mcKin.RangeToKm(track);
  
          // set target type
          int nTargetType;
! 
!         if (track.IsSurface())
!         {
              nTargetType = SURFACE_TARGET;
          }
!         else if (track.IsAir())
!         {
              nTargetType = AIR_TARGET;
          }
!         else if (track.IsMissile())
!         {
              nTargetType = MISSILE_TARGET;
          }
!         else 
!         {
              nTargetType = 0; // error, unknown target type
          }
***************
*** 348,364 ****
          // or shortest range launcher if target is in range
          int nCount = GetLauncherCount();
!         for (int n=0;n<nCount;n++) {
              tcLauncherInfo info;
!             if (GetLauncherInfo(info, n)) {
                  int bCompatible = info.mnTargetFlags & nTargetType;
                  bool bInRange = info.mfRange_km <= mfTargetRange;
!                 if (bCompatible && info.mnQuantity) {
!                     if (best.mnLauncher == -1) {
                          best = info;
                      }
!                     else if (bInRange && (info.mfRange_km < best.mfRange_km)) {
                          best = info;
                      }
!                     else if (info.mfRange_km > best.mfRange_km) {
                          best = info;
                      }
--- 361,383 ----
          // or shortest range launcher if target is in range
          int nCount = GetLauncherCount();
!         for (int n=0;n<nCount;n++) 
!         {
              tcLauncherInfo info;
!             if (GetLauncherInfo(info, n)) 
!             {
                  int bCompatible = info.mnTargetFlags & nTargetType;
                  bool bInRange = info.mfRange_km <= mfTargetRange;
!                 if (bCompatible && info.mnQuantity) 
!                 {
!                     if (best.mnLauncher == -1) 
!                     {
                          best = info;
                      }
!                     else if (bInRange && (info.mfRange_km < best.mfRange_km)) 
!                     {
                          best = info;
                      }
!                     else if (info.mfRange_km > best.mfRange_km) 
!                     {
                          best = info;
                      }
***************
*** 454,458 ****
          if (launcherStatus != tcLauncherState::LAUNCHER_READY)
          {
- 
              DisplayMessage(tcLauncherState::TranslateLauncherStatus(launcherStatus));
          }
--- 473,476 ----