Changeset 11211 for code/branches/ogre1.9/data/gui/scripts/ShipSelectionMenu.lua

Timestamp:

Jul 5, 2016, 11:46:10 PM (8 years ago)

Author:

bknecht

Message:

Merging cegui0.8 branch into ogre1.9 branch

Location:

code/branches/ogre1.9

Files:

• . (modified) (1 prop)
• data/gui/scripts/ShipSelectionMenu.lua (modified) (2 diffs)

code/branches/ogre1.9/data/gui/scripts/ShipSelectionMenu.lua

@@ -34 +34 @@
         --if tag == nil or v:hasStartingShip(tag) then
             local item = CEGUI.createListboxTextItem(v)
-            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
             listbox:addItem(item)
             table.insert(tabIndexes, k)
@@ -88 +88 @@
         --local imageName = selectedlevel:getScreenshot()
         -- set the screenshot and the description for the selected level
-        --levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+        --levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
         --levelDescription:setText(level:getDescription())
         -- only enable config button for "gametype" levels