Changeset 11710 for code/trunk/data

Timestamp:

Jan 7, 2018, 12:50:29 AM (7 years ago)

Author:

landauf

Message:

fixed two bugs in PickupInventory.lua:

• the update function had a messed up logic regarding the use-button in the detail window (condition was partially inverted)
• updating the event subscription of the use-button in the detail-window doesn't seem to work - probably CEGUI doesn't like updating/changing/overriding an event while begin IN a mouse-click-event already. moving the logic to the Use/Unuse-function instead seems to work.

File:

• code/trunk/data/gui/scripts/PickupInventory.lua (modified) (7 diffs)

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

@@ -51 +51 @@
                 else
                     useButton:setEnabled(true)
-                    if pickup.inUse == true then
-                        useButton:setText("unuse")
-                        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseDetailButton_clicked")
+                    if pickup.inUse == false then
+                        useButton:setText("use")
                         if pickup.usable == false then
                             useButton:setEnabled(false)
                         end
                     else
-                        useButton:setText("use")
-                        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUnuseDetailButton_clicked")
+                        useButton:setText("unuse")
                         if pickup.unusable == false then
                             useButton:setEnabled(false)
@@ -135 +133 @@
     if pickup.inUse == false then
         useButton:setText("use")
-        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseButton_clicked")
         if pickup.usable == false then
             useButton:setEnabled(false)
@@ -141 +138 @@
     else
         useButton:setText("unuse")
-        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUnuseButton_clicked")
         if pickup.unusable == false then
             useButton:setEnabled(false)
         end
     end
+    orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseUnuseButton_clicked")
     item:addChildWindow(useButton)
 
@@ -240 +237 @@
     if pickup.inUse == false then
         useButton:setText("use")
-        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseDetailButton_clicked")
         if pickup.usable == false then
             useButton:setEnabled(false)
@@ -246 +242 @@
     else
         useButton:setText("unuse")
-        orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUnuseDetailButton_clicked")
         if pickup.unusable == false then
             useButton:setEnabled(false)
         end
     end
+    orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseUnuseDetailButton_clicked")
     wrapper:addChildWindow(useButton)
     
@@ -275 +271 @@
 end
 
-function P.InventoryUseButton_clicked(e)
+function P.InventoryUseUnuseButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
     local pickup = P.pickupsList[pickupIndex]
-    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, true)
-end
-
-function P.InventoryUnuseButton_clicked(e)
-    local pickupIndex = P.windowToPickupHelper(e)
-    local pickup = P.pickupsList[pickupIndex]
-    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, false)
+    if pickup.inUse == false then
+        orxonox.PickupManager:getInstance():usePickup(pickup.pickup, true)
+    else
+        orxonox.PickupManager:getInstance():usePickup(pickup.pickup, false)
+    end
 end
 
@@ -298 +292 @@
 end
 
-function P.InventoryUseDetailButton_clicked(e)
+function P.InventoryUseUnuseDetailButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
     local pickup = P.detailPickups[pickupIndex]
-    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, true)
-end
-
-function P.InventoryUnuseDetailButton_clicked(e)
-    local pickupIndex = P.windowToPickupHelper(e)
-    local pickup = P.detailPickups[pickupIndex]
-    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, false)
+    if pickup.inUse == false then
+        orxonox.PickupManager:getInstance():usePickup(pickup.pickup, true)
+    else
+        orxonox.PickupManager:getInstance():usePickup(pickup.pickup, false)
+    end
 end