[Gcblue-commits] gcb_wx/scripts AI.py,1.10,1.11 UnitCommands.py,1.6,1.7

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

Update of /cvsroot/gcblue/gcb_wx/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3451/scripts

Modified Files:
	AI.py UnitCommands.py 
Log Message:


Index: AI.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/AI.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AI.py	18 Jul 2004 03:18:00 -0000	1.10
--- AI.py	23 Jul 2004 00:45:47 -0000	1.11
***************
*** 322,327 ****
              lat = target_info.Lat
              lon = target_info.Lon
              UI.HandoffTargetToLauncher(launcher) # to store intended target
!             UI.SendDatumToLauncher(lon,lat,launcher)
              UI.Launch(launcher, launch_qty)
              UI.SetVar(0,1)
--- 322,328 ----
              lat = target_info.Lat
              lon = target_info.Lon
+             alt = target_info.Alt
              UI.HandoffTargetToLauncher(launcher) # to store intended target
!             UI.SendDatumToLauncher(lon,lat,alt,launcher)
              UI.Launch(launcher, launch_qty)
              UI.SetVar(0,1)

Index: UnitCommands.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** UnitCommands.py	15 Feb 2004 19:47:22 -0000	1.6
--- UnitCommands.py	23 Jul 2004 00:45:47 -0000	1.7
***************
*** 27,31 ****
  
  def LaunchDatum(UI, lon, lat, launcher_num):
!     UI.SendDatumToLauncher(lon,lat,launcher_num)
      UI.Launch(launcher_num, 1)
  
--- 27,34 ----
  
  def LaunchDatum(UI, lon, lat, launcher_num):
!     datum_alt = UI.GetMapTerrainElevation(lon, lat)
!     if (datum_alt < 5.0):
!         datum_alt = 0.0
!     UI.SendDatumToLauncher(lon,lat,datum_alt + 5.0,launcher_num)
      UI.Launch(launcher_num, 1)
  
***************
*** 47,52 ****
          lon = track_info.Lon
          UI.HandoffTargetToLauncher(launcher) # so that intended target is set
!         UI.SendDatumToLauncher(lon,lat,launcher)
!         UI.Launch(launcher,1)
      else:  # handoff to active seeker
          target_accepted = UI.HandoffTargetToLauncher(launcher)
--- 50,54 ----
          lon = track_info.Lon
          UI.HandoffTargetToLauncher(launcher) # so that intended target is set
!         LaunchDatum(UI, lon, lat, launcher)
      else:  # handoff to active seeker
          target_accepted = UI.HandoffTargetToLauncher(launcher)