Changeset 11704 for code/trunk/data/gui/scripts/KeyBindMenu.lua

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

File:

• code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) (2 diffs)

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")