[Scummvm-cvs-logs] SF.net SVN: scummvm: [31745] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31745
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31745&view=rev
Author:   lordhoto
Date:     2008-04-26 16:43:12 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/kyra_v3.h
    scummvm/trunk/engines/kyra/scene_v3.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-26 23:26:47 UTC (rev 31744)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-26 23:43:12 UTC (rev 31745)
@@ -73,7 +73,6 @@
 	_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 @@
 
 	_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::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));

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-26 23:26:47 UTC (rev 31744)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-26 23:43:12 UTC (rev 31745)
@@ -463,7 +463,6 @@
 
 	ScriptState _sceneScriptState;
 	ScriptData _sceneScriptData;
-	WSAMovieV2 *_wsaSlots[10];
 
 	bool _specialSceneScriptState[10];
 	bool _specialSceneScriptStateBackup[10];

Modified: scummvm/trunk/engines/kyra/scene_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-26 23:26:47 UTC (rev 31744)
+++ scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-26 23:43:12 UTC (rev 31745)
@@ -101,11 +101,6 @@
 
 	musicUpdate(0);
 
-	for (int i = 0; i < 10; ++i)
-		_wsaSlots[i]->close();
-
-	musicUpdate(0);
-
 	_specialExitCount = 0;
 	Common::set_to(_specialExitTable, _specialExitTable+ARRAYSIZE(_specialExitTable), 0xFFFF);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.