Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 27, 2011, 9:54:03 PM (13 years ago)
Author:
landauf
Message:

merged revisions 8527-8530 from trunk to presentation branch:

  • 8527: build fix for mingw, d_ostream.open() is not defined for wchar
  • 8528: disable LOD for some of the debris meshes which cause a crash on old versions of Ogre
  • 8529: fixed lua error when pressing ESC ingame after closing the console
  • 8530: added config value to define the scroll speed in CEGUI listboxes. default 1 line.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/data/gui/scripts/SheetManager.lua

    r8584 r8627  
    216216function keyESC()
    217217    -- HUGE, very HUGE hacks!
    218    
     218
    219219    -- If the InGameConsole is active, ignore the ESC command.
    220220    if bInGameConsoleClosed == true then
    221221        bInGameConsoleClosed = false
    222         if activeMenuSheets[i] and activeMenuSheets[1].sheet.name == "MainMenu" then
     222        if activeMenuSheets[1] and activeMenuSheets[1].sheet.name == "MainMenu" then
    223223            return
    224224        end
Note: See TracChangeset for help on using the changeset viewer.