diff options
author | Christopher Page | 2008-08-10 21:58:18 +0000 |
---|---|---|
committer | Christopher Page | 2008-08-10 21:58:18 +0000 |
commit | fcc00f20b93d719c9f7bce848ed7c3600be982b9 (patch) | |
tree | 48b9fd1c842cb376985a91592ef7b062fed0cfa7 /engines/cine/cine.cpp | |
parent | ce3d1e1a7d9ec9860d3fc42d8127a1634051d950 (diff) | |
parent | 9d0b0523cf119fdc400bf477c2f9d6f4f37ddce6 (diff) | |
download | scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.tar.gz scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.tar.bz2 scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.zip |
Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33769
Diffstat (limited to 'engines/cine/cine.cpp')
-rw-r--r-- | engines/cine/cine.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index 127d390f66..c30cac63a5 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -124,6 +124,22 @@ int CineEngine::modifyGameSpeed(int speedChange) { } void CineEngine::initialize() { + // Resize object table to its correct size and reset all its elements + objectTable.resize(NUM_MAX_OBJECT); + resetObjectTable(); + + // Resize animation data table to its correct size and reset all its elements + animDataTable.resize(NUM_MAX_ANIMDATA); + freeAnimDataTable(); + + // Resize zone data table to its correct size and reset all its elements + zoneData.resize(NUM_MAX_ZONE); + Common::set_to(zoneData.begin(), zoneData.end(), 0); + + // Resize zone query table to its correct size and reset all its elements + zoneQuery.resize(NUM_MAX_ZONE); + Common::set_to(zoneQuery.begin(), zoneQuery.end(), 0); + _timerDelayMultiplier = 12; // Set default speed setupOpcodes(); @@ -160,8 +176,7 @@ void CineEngine::initialize() { freeAnimDataTable(); overlayList.clear(); messageTable.clear(); - - memset(objectTable, 0, sizeof(objectTable)); + resetObjectTable(); var8 = 0; |