mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-21 01:05:59 +00:00
Cleanup.
svn-id: r31745
This commit is contained in:
parent
9b3edffa8d
commit
f6e622e303
@ -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));
|
||||
|
@ -463,7 +463,6 @@ private:
|
||||
|
||||
ScriptState _sceneScriptState;
|
||||
ScriptData _sceneScriptData;
|
||||
WSAMovieV2 *_wsaSlots[10];
|
||||
|
||||
bool _specialSceneScriptState[10];
|
||||
bool _specialSceneScriptStateBackup[10];
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user