gcblue-commits

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

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

Modified Files:
	tcPlatformInterface.cpp 
Log Message:
OpenAL++ updates, added point defense

Index: tcPlatformInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterface.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** tcPlatformInterface.cpp	10 Mar 2005 03:28:29 -0000	1.39
--- tcPlatformInterface.cpp	25 Mar 2005 03:48:07 -0000	1.40
***************
*** 987,1014 ****
          tcSensorMapTrack track;
  
!         tcGameObject* obj = mpSimState->GetObject(id);
!         if (obj == NULL) return track; // target not found
  
!         // return truth data if own alliance
!         if (mpSimState->mpUserInfo->IsOwnAlliance(obj->mnAlliance)) 
!         {
!             tcKinematics *kin = &obj->mcKin;
!             track.mfAlt_m = kin->mfAlt_m;
!             track.mfHeading_rad = kin->mfHeading_rad;
!             track.mfLat_rad = (float)kin->mfLat_rad;
!             track.mfLon_rad = (float)kin->mfLon_rad;
!             track.mfSpeed_kts = kin->mfSpeed_kts;
!             track.mnClassification = obj->mpDBObject->mnType;
!             track.mnID = obj->mnID;
!             track.mnAffiliation = FRIENDLY;
!             return track;
!         }
!         else
!         {
!             tcSensorMapTrack *pTrack = 
!                 mpSimState->mcSensorMap.GetSensorMapTrack(obj->mnID, mpPlatformObj->mnAlliance);
!             if (pTrack) track = *pTrack;
!             return track;
!         }
      }
  
--- 987,993 ----
          tcSensorMapTrack track;
  
!         bool found = mpSimState->GetTrack(id, mpPlatformObj->mnAlliance, track);
  
!         return track;
      }
  
***************
*** 1098,1102 ****
      {
          tcGameObject* obj = mpSimState->GetObjectByName(unitName);
!         if ((obj == 0) || !mpSimState->mpUserInfo->IsOwnAlliance(obj->mnAlliance))
  		{
  			return -1;
--- 1077,1083 ----
      {
          tcGameObject* obj = mpSimState->GetObjectByName(unitName);
!         bool isOwnAlliance = mpPlatformObj->mnAlliance == obj->mnAlliance;
! 
!         if ((obj == 0) || !isOwnAlliance)
  		{
  			return -1;