Changeset 9050 for code/trunk

Timestamp:

Mar 21, 2012, 9:31:38 PM (13 years ago)

Author:

dafrick

Message:

More elegant resolution of discrepancies between cegui 0.6 and 0.7.

Location:

code/trunk

Files:

• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)

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

@@ -51 +51 @@
             local imageName = level:getScreenshot()
             if imageName ~= "" then
-                if guiMgr:usingOldCEGUI() then
-                    CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, imageName)
-                else
-                    CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, imageName)
-                end
+                CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, imageName)
             else
-                if guiMgr:usingOldCEGUI() then
-                    CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
-                else
-                    CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
-                end
+                CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
             end
             table.insert(P.levelList, level)

code/trunk/src/libraries/core/GUIManager.cc

@@ -313 +313 @@
         luaState_->doString("CEGUI.SchemeManager.create = CEGUI.SchemeManager.loadScheme");
         luaState_->doString("CEGUI.Window.getUnclippedOuterRect = CEGUI.Window.getUnclippedPixelRect");
+        luaState_->doString("CEGUI.ImagesetManager.createFromImageFile= CEGUI.ImagesetManager.createImagesetFromImageFile");
 #else
         guiSystem_ = &System::create(*guiRenderer_, resourceProvider_, 0, imageCodec_, scriptModule_);