[Orxonox-commit 4378] r9049 - code/trunk/data/gui/scripts
dafrick at orxonox.net
dafrick at orxonox.net
Wed Mar 21 18:36:31 CET 2012
Author: dafrick
Date: 2012-03-21 18:36:31 +0100 (Wed, 21 Mar 2012)
New Revision: 9049
Modified:
code/trunk/data/gui/scripts/SingleplayerMenu.lua
Log:
Fixing problem due to CEGUI version conflict.
Modified: code/trunk/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/SingleplayerMenu.lua 2012-03-21 07:06:06 UTC (rev 9048)
+++ code/trunk/data/gui/scripts/SingleplayerMenu.lua 2012-03-21 17:36:31 UTC (rev 9049)
@@ -50,9 +50,17 @@
-- create an imageset for each screenshot
local imageName = level:getScreenshot()
if imageName ~= "" then
- CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, imageName)
+ if guiMgr:usingOldCEGUI() then
+ CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, imageName)
+ else
+ CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, imageName)
+ end
else
- CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
+ if guiMgr:usingOldCEGUI() then
+ CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
+ else
+ CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
+ end
end
table.insert(P.levelList, level)
end
More information about the Orxonox-commit
mailing list