[Orxonox-commit 4379] r9050 - in code/trunk: data/gui/scripts src/libraries/core

[dafrick at orxonox.net]

Author: dafrick
Date: 2012-03-21 21:31:38 +0100 (Wed, 21 Mar 2012)
New Revision: 9050

Modified:
   code/trunk/data/gui/scripts/SingleplayerMenu.lua
   code/trunk/src/libraries/core/GUIManager.cc
Log:
More elegant resolution of discrepancies between cegui 0.6 and 0.7.


Modified: code/trunk/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/SingleplayerMenu.lua	2012-03-21 17:36:31 UTC (rev 9049)
+++ code/trunk/data/gui/scripts/SingleplayerMenu.lua	2012-03-21 20:31:38 UTC (rev 9050)
@@ -50,17 +50,9 @@
             -- create an imageset for each screenshot
             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)
         end

Modified: code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- code/trunk/src/libraries/core/GUIManager.cc	2012-03-21 17:36:31 UTC (rev 9049)
+++ code/trunk/src/libraries/core/GUIManager.cc	2012-03-21 20:31:38 UTC (rev 9050)
@@ -312,6 +312,7 @@
         // Add functions that have been renamed in newer versions
         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_);
 #endif