[Gcblue-commits] gcb_wx/scripts Menu.py,1.12,1.13 UnitCommands.py,1.16,1.17

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

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

Modified Files:
	Menu.py UnitCommands.py 
Log Message:
New feature to display 3D models for sensor tracks based on track position (only generic models for now)

Index: UnitCommands.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** UnitCommands.py	29 Mar 2005 00:12:25 -0000	1.16
--- UnitCommands.py	17 May 2005 00:20:40 -0000	1.17
***************
*** 1,3 ****
--- 1,9 ----
  
+ def TakeControl(UI):
+     UI.TakeControl()
+ 
+ def ReleaseControl(UI):
+     UI.ReleaseControl()
+ 
  def AddEngageAllOrder(UI):
      UI.AddTask('EngageAll', 2.0)

Index: Menu.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Menu.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Menu.py	29 Mar 2005 00:12:25 -0000	1.12
--- Menu.py	17 May 2005 00:20:40 -0000	1.13
***************
*** 60,63 ****
--- 60,76 ----
      if (not UnitInfo.IsValid()):
          return
+ 
+ 
+     # Multiplayer options
+     if (UnitInfo.IsMultiplayerActive()):
+         if (not UnitInfo.IsPlayerControlled()):
+             if (UnitInfo.IsAvailable()):
+                 UnitMenu.AddItem('Take control', 'TakeControl')
+                 return
+             else:
+                 UnitMenu.AddItem('Unavailable unit', '')
+                 return
+ 
+ 
      UnitMenu.AddItemUI('Change heading','SetHeading','Heading')
      # Speed submenu
***************
*** 82,92 ****
      UnitMenu.AddItem('Tasks','')
      UnitMenu.BeginSubMenu() 
!     UnitMenu.AddItem('ZigZag patrol','AddPatrolOrder')
      UnitMenu.AddItemUI('Patrol station','AddPatrolStation', 'Datum')
      UnitMenu.AddItemUI('Add waypoint', 'AddWaypointOrder', 'Datum')
!     UnitMenu.AddItem('EngageAll', 'AddEngageAllOrder')
!     UnitMenu.AddItem('Missile alert', 'AddMissileWarnTask')
!     UnitMenu.AddItem('Clear waypoints','ClearWaypoints')
!     UnitMenu.AddItem('Clear all tasks','ClearTasks')
      UnitMenu.EndSubMenu() 
      
--- 95,105 ----
      UnitMenu.AddItem('Tasks','')
      UnitMenu.BeginSubMenu() 
!     UnitMenu.AddItemUI('ZigZag patrol','AddPatrolOrder','Null')
      UnitMenu.AddItemUI('Patrol station','AddPatrolStation', 'Datum')
      UnitMenu.AddItemUI('Add waypoint', 'AddWaypointOrder', 'Datum')
!     UnitMenu.AddItemUI('EngageAll', 'AddEngageAllOrder','Null')
!     UnitMenu.AddItemUI('Missile alert', 'AddMissileWarnTask','Null')
!     UnitMenu.AddItemUI('Clear waypoints','ClearWaypoints','Null')
!     UnitMenu.AddItemUI('Clear all tasks','ClearTasks','Null')
      UnitMenu.EndSubMenu() 
      
***************
*** 110,113 ****
--- 123,128 ----
          UnitMenu.AddItem('Flight deck', 'ShowFlightPanel')
  
+     if (UnitInfo.IsPlayerControlled()):
+         UnitMenu.AddItem('Release control', 'ReleaseControl')