diff options
| author | Johannes Schickel | 2009-06-29 17:26:43 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-29 17:26:43 +0000 |
| commit | 11dafd2dedaa06bc9c03e0298d6ab4d623c38131 (patch) | |
| tree | 096a0acbf615c5280ca96514b803dc0f6f4bb873 /engines/kyra | |
| parent | fbefe917f229c8d7314575cd76cbce3c9c4fc313 (diff) | |
| download | scummvm-rg350-11dafd2dedaa06bc9c03e0298d6ab4d623c38131.tar.gz scummvm-rg350-11dafd2dedaa06bc9c03e0298d6ab4d623c38131.tar.bz2 scummvm-rg350-11dafd2dedaa06bc9c03e0298d6ab4d623c38131.zip | |
Resolved some TODOs in Kyra3 code.
svn-id: r41957
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_mr.cpp | 6 | ||||
| -rw-r--r-- | engines/kyra/scene_mr.cpp | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 2a69c49679..a9f8ac9975 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -269,7 +269,6 @@ Common::Error KyraEngine_MR::go() { _screen->setScreenPalette(_screen->getPalette(0)); - // XXX playMenuAudioFile(); for (int i = 0; i < 64 && !shouldQuit(); ++i) { @@ -558,9 +557,7 @@ void KyraEngine_MR::startup() { _screen->setFont(Screen::FID_6_FNT); _stringBuffer = new char[500]; - //XXX musicUpdate(0); - //XXX allocAnimObjects(1, 16, 50); musicUpdate(0); @@ -585,13 +582,10 @@ void KyraEngine_MR::startup() { error("couldn't load _ACTOR"); musicUpdate(0); - //XXX - musicUpdate(0); openTalkFile(0); musicUpdate(0); _currentTalkFile = 0; openTalkFile(1); - //XXX loadCostPal(); musicUpdate(0); diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index 75dd3e1826..a68dcfb394 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -48,10 +48,8 @@ void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2 } musicUpdate(0); - if (!unk3) { - //XXX + if (!unk3) musicUpdate(0); - } if (unk1) { int x = _mainCharacter.x1; @@ -88,7 +86,7 @@ void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2 newSoundFile = true; } - //XXX + _chatAltFlag = false; if (!unk3) { _emc->init(&_sceneScriptState, &_sceneScriptData); |