Changeset 444 for trunk/game/scripts/gui/hud.py

Timestamp:

12/12/09 13:55:50 (10 years ago)

Author:

b0rland_parpg

Message:

Ticket #107: patch by b0rland
Ready slots in hud are now updated in sync with inventory

File:

• trunk/game/scripts/gui/hud.py (modified) (3 diffs)

trunk/game/scripts/gui/hud.py

@@ -63 +63 @@
         self.actions_text = []
         self.menu_displayed = False
+        self.inventory_storage = None
         self.initializeHud()
         self.initializeMainMenu()
@@ -135 +136 @@
             'toggleInventoryButton': self.toggleInventoryButton,
         }
+        self.inventory_storage = self.data.game_state.PC.inventory
         self.inventory = inventorygui.InventoryGUI(self.engine,
-                                            self.data.game_state.PC.inventory,
+                                            self.inventory_storage,
                                             inv_callbacks)
         self.refreshReadyImages()
@@ -404 +406 @@
            on the inventory
            @return: None"""
-        self.setImages(self.hud.findChild(name="hudReady1"),
-                       self.inventory.getImage("Ready1").up_image)
-
-        self.setImages(self.hud.findChild(name="hudReady2"),
-                       self.inventory.getImage("Ready2").up_image)
-
-        self.setImages(self.hud.findChild(name="hudReady3"),
-                       self.inventory.getImage("Ready3").up_image)
-
-        self.setImages(self.hud.findChild(name="hudReady4"),
-                       self.inventory.getImage("Ready4").up_image)
+        for ready in range(1,5):
+            button = self.hud.findChild(name=("hudReady%d" % ready))
+            if self.inventory_storage == None :
+                origin = None
+            else:
+               origin = self.inventory_storage.getItemsInSlot('ready', ready-1)
+            if origin == None:
+                self.setImages(button, self.inventory.slot_empty_images['ready'])
+            else:
+                self.setImages(button,origin.getInventoryThumbnail())
 
     def setImages(self, widget, image):