Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9050 for code/trunk


Ignore:
Timestamp:
Mar 21, 2012, 9:31:38 PM (12 years ago)
Author:
dafrick
Message:

More elegant resolution of discrepancies between cegui 0.6 and 0.7.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/data/gui/scripts/SingleplayerMenu.lua

    r9049 r9050  
    5151            local imageName = level:getScreenshot()
    5252            if imageName ~= "" then
    53                 if guiMgr:usingOldCEGUI() then
    54                     CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, imageName)
    55                 else
    56                     CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, imageName)
    57                 end
     53                CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, imageName)
    5854            else
    59                 if guiMgr:usingOldCEGUI() then
    60                     CEGUI.ImagesetManager:getSingleton():createImagesetFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
    61                 else
    62                     CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
    63                 end
     55                CEGUI.ImagesetManager:getSingleton():createFromImageFile(levelXMLFilename..imageName, "noscreenshot.png")
    6456            end
    6557            table.insert(P.levelList, level)
  • code/trunk/src/libraries/core/GUIManager.cc

    r9016 r9050  
    313313        luaState_->doString("CEGUI.SchemeManager.create = CEGUI.SchemeManager.loadScheme");
    314314        luaState_->doString("CEGUI.Window.getUnclippedOuterRect = CEGUI.Window.getUnclippedPixelRect");
     315        luaState_->doString("CEGUI.ImagesetManager.createFromImageFile= CEGUI.ImagesetManager.createImagesetFromImageFile");
    315316#else
    316317        guiSystem_ = &System::create(*guiRenderer_, resourceProvider_, 0, imageCodec_, scriptModule_);
Note: See TracChangeset for help on using the changeset viewer.