diff options
author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /engines/lure/lure.cpp | |
parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/lure/lure.cpp')
-rw-r--r-- | engines/lure/lure.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index c6be5c48fe..3217cf039d 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -51,7 +51,7 @@ LureEngine::LureEngine(OSystem *system, const LureGameDescription *gameDesc) Common::Error LureEngine::init() { int_engine = this; - _initialised = false; + _initialized = false; _saveLoadAllowed = false; initGraphics(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT, false); @@ -85,12 +85,12 @@ Common::Error LureEngine::init() { _mouse = new Mouse(); _events = new Events(); _menu = new Menu(); - Surface::initialise(); + Surface::initialize(); _room = new Room(); _fights = new FightsManager(); _gameToLoad = -1; - _initialised = true; + _initialized = true; // Setup mixer syncSoundSettings(); @@ -102,9 +102,9 @@ LureEngine::~LureEngine() { // Remove all of our debug levels here DebugMan.clearAllDebugChannels(); - if (_initialised) { - // Delete and deinitialise subsystems - Surface::deinitialise(); + if (_initialized) { + // Delete and deinitialize subsystems + Surface::deinitialize(); Sound.destroy(); delete _fights; delete _room; |