Changeset 11704 for code/trunk/data

Timestamp:

Jan 6, 2018, 3:16:00 AM (7 years ago)

Author:

landauf

Message:

[HUD_HS16] fixed wrong dependency between overlays and pickup module: pickup should NOT depend on overlays; instead overlays should use pickup.

also reverted all changes from HUD_HS16 in PickupManager for several reasons:

• calling HUDPickupSystem is not necessary anymore due to the fixed dependencies
• adding a console command is not necessary because there is already a full GUI for this purpose (press F4)
• limiting the number of pickups to 10 is a bad idea because PickupManager manages pickups for ALL players in the game

Location:

code/trunk/data

Files:

• defaultConfig/keybindings.ini (modified) (2 diffs)
• gui/scripts/KeyBindMenu.lua (modified) (2 diffs)

code/trunk/data/defaultConfig/keybindings.ini

@@ -70 +70 @@
 KeyNoConvert=
 KeyNumLock=
-KeyNumRow0="useUnusePickup 0"
-KeyNumRow1="useUnusePickup 1"
-KeyNumRow2="useUnusePickup 2"
-KeyNumRow3="useUnusePickup 3"
-KeyNumRow4="useUnusePickup 4"
-KeyNumRow5="useUnusePickup 5"
-KeyNumRow6="useUnusePickup 6"
-KeyNumRow7="useUnusePickup 7"
-KeyNumRow8="useUnusePickup 8"
-KeyNumRow9="useUnusePickup 9"
-KeyNumpad0="useUnusePickup 0"
-KeyNumpad1="useUnusePickup 1"
-KeyNumpad2="useUnusePickup 2"
-KeyNumpad3="useUnusePickup 3"
-KeyNumpad4="useUnusePickup 4"
-KeyNumpad5="useUnusePickup 5"
-KeyNumpad6="useUnusePickup 6"
-KeyNumpad7="useUnusePickup 7"
-KeyNumpad8="useUnusePickup 8"
-KeyNumpad9="useUnusePickup 9"
+KeyNumRow0=
+KeyNumRow1="toggleFormationFlight"
+KeyNumRow2="FFChangeMode"
+KeyNumRow3=
+KeyNumRow4=
+KeyNumRow5=
+KeyNumRow6=
+KeyNumRow7=
+KeyNumRow8=
+KeyNumRow9=
+KeyNumpad0=
+KeyNumpad1=
+KeyNumpad2=
+KeyNumpad3=
+KeyNumpad4=
+KeyNumpad5=
+KeyNumpad6=
+KeyNumpad7=
+KeyNumpad8=
+KeyNumpad9=
 KeyNumpadAdd=
 KeyNumpadComma=
@@ -96 +96 @@
 KeyNumpadPeriod=
 KeyNumpadSubtract=
-KeyO="toggleFormationFlight"
-KeyP="FFChangeMode"
+KeyO=
+KeyP=
 KeyPageDown="scale -1 rotateRoll"
 KeyPageUp=

code/trunk/data/gui/scripts/KeyBindMenu.lua

@@ -36 +36 @@
     table.insert(commandList, "pause")
     table.insert(commandList, "printScreen")
-    table.insert(commandList, "useUnusePickup")
     if orxonox.GUIManager:inDevMode() then
         table.insert(commandList, "printScreenHD")
@@ -72 +71 @@
     table.insert(nameList, "Pause")
     table.insert(nameList, "Screenshot")
-    table.insert(nameList, "Pickup 0")
     if orxonox.GUIManager:inDevMode() then
         table.insert(nameList, "HD screenshot")