diff options
| author | Johannes Schickel | 2008-04-26 23:43:12 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-26 23:43:12 +0000 |
| commit | f6e622e303fa6ef58d479d7be098f188741b7e5c (patch) | |
| tree | d879ceeb69d1b452d4b6d250352829288da96de8 | |
| parent | 9b3edffa8dcc532370d3e8d924610642701237bf (diff) | |
| download | scummvm-rg350-f6e622e303fa6ef58d479d7be098f188741b7e5c.tar.gz scummvm-rg350-f6e622e303fa6ef58d479d7be098f188741b7e5c.tar.bz2 scummvm-rg350-f6e622e303fa6ef58d479d7be098f188741b7e5c.zip | |
Cleanup.
svn-id: r31745
| -rw-r--r-- | engines/kyra/kyra_v3.cpp | 9 | ||||
| -rw-r--r-- | engines/kyra/kyra_v3.h | 1 | ||||
| -rw-r--r-- | engines/kyra/scene_v3.cpp | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp index 574ffd24d3..cd624b27d8 100644 --- a/engines/kyra/kyra_v3.cpp +++ b/engines/kyra/kyra_v3.cpp @@ -73,7 +73,6 @@ KyraEngine_v3::KyraEngine_v3(OSystem *system, const GameFlags &flags) : KyraEngi _inventoryState = false; memset(&_sceneScriptState, 0, sizeof(_sceneScriptState)); memset(&_sceneScriptData, 0, sizeof(_sceneScriptData)); - memset(_wsaSlots, 0, sizeof(_wsaSlots)); _updateCharPosNextUpdate = 0; memset(_characterAnimTable, 0, sizeof(_characterAnimTable)); _overwriteSceneFacing = false; @@ -175,9 +174,6 @@ KyraEngine_v3::~KyraEngine_v3() { _scriptInterpreter->unloadScript(&_sceneScriptData); - for (int i = 0; i < ARRAYSIZE(_wsaSlots); ++i) - delete _wsaSlots[i]; - delete [] _sceneStrings; delete [] _talkObjectList; delete [] _moveFacingTable; @@ -524,11 +520,6 @@ void KyraEngine_v3::initMouseShapes() { void KyraEngine_v3::startup() { debugC(9, kDebugLevelMain, "KyraEngine_v3::startup()"); - for (int i = 0; i < ARRAYSIZE(_wsaSlots); ++i) { - _wsaSlots[i] = new WSAMovieV2(this, _screen); - assert(_wsaSlots[i]); - } - musicUpdate(0); memset(_flagsTable, 0, sizeof(_flagsTable)); diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h index ae5b9040de..f4a8ed39dd 100644 --- a/engines/kyra/kyra_v3.h +++ b/engines/kyra/kyra_v3.h @@ -463,7 +463,6 @@ private: ScriptState _sceneScriptState; ScriptData _sceneScriptData; - WSAMovieV2 *_wsaSlots[10]; bool _specialSceneScriptState[10]; bool _specialSceneScriptStateBackup[10]; diff --git a/engines/kyra/scene_v3.cpp b/engines/kyra/scene_v3.cpp index 529ee0f3e3..3485e95d1c 100644 --- a/engines/kyra/scene_v3.cpp +++ b/engines/kyra/scene_v3.cpp @@ -101,11 +101,6 @@ void KyraEngine_v3::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2 musicUpdate(0); - for (int i = 0; i < 10; ++i) - _wsaSlots[i]->close(); - - musicUpdate(0); - _specialExitCount = 0; Common::set_to(_specialExitTable, _specialExitTable+ARRAYSIZE(_specialExitTable), 0xFFFF); |