diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/kyra/kyra_lok.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/kyra/kyra_lok.cpp')
| -rw-r--r-- | engines/kyra/kyra_lok.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 27d0849e5f..84990bcfb8 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -174,6 +174,9 @@ Common::Error KyraEngine_LoK::init() { assert(_screen); _screen->setResolution(); + _debugger = new Debugger_LoK(this); + assert(_debugger); + KyraEngine_v1::init(); _sprites = new Sprites(this, _system); @@ -229,8 +232,6 @@ Common::Error KyraEngine_LoK::init() { memset(&_scriptMain, 0, sizeof(EMCState)); memset(&_scriptClick, 0, sizeof(EMCState)); - _debugger = new Debugger_LoK(this); - assert(_debugger); memset(_shapes, 0, sizeof(_shapes)); for (int i = 0; i < ARRAYSIZE(_movieObjects); ++i) @@ -254,7 +255,7 @@ Common::Error KyraEngine_LoK::init() { _poisonDeathCounter = 0; memset(_itemHtDat, 0, sizeof(_itemHtDat)); - memset(_exitList, 0xFFFF, sizeof(_exitList)); + memset(_exitList, 0xFF, sizeof(_exitList)); _exitListPtr = 0; _pathfinderFlag = _pathfinderFlag2 = 0; _lastFindWayRet = 0; @@ -436,6 +437,9 @@ void KyraEngine_LoK::startup() { } void KyraEngine_LoK::mainLoop() { + // Initialize debugger since how it should be fully usable + _debugger->initialize(); + _eventList.clear(); while (!shouldQuit()) { |