diff options
| author | Johannes Schickel | 2008-03-03 23:38:22 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-03 23:38:22 +0000 |
| commit | 4b4e93b19047b2319d77938696511dd6573bcd4f (patch) | |
| tree | 40cb50cc8a5e7ba8b8939cfe376719150cd97a36 /engines/kyra | |
| parent | 61390db7f0ca39858036424108c6d3e8427613af (diff) | |
| download | scummvm-rg350-4b4e93b19047b2319d77938696511dd6573bcd4f.tar.gz scummvm-rg350-4b4e93b19047b2319d77938696511dd6573bcd4f.tar.bz2 scummvm-rg350-4b4e93b19047b2319d77938696511dd6573bcd4f.zip | |
Fixed some uninitialized variables.
svn-id: r31041
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 12 | ||||
| -rw-r--r-- | engines/kyra/sequences_v2.cpp | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 5a693f1c08..61b5c00c7c 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -100,8 +100,20 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags) : KyraEngi _colorCodeFlag2 = -1; _scriptCountDown = 0; + _gamePlayBuffer = 0; + _unkBuf500Bytes = 0; + _screenBuffer = 0; + _unkBuf200kByte = 0; + memset(&_defaultShapeTable, 0, sizeof(_defaultShapeTable)); + memset(&_sceneShapeTable, 0, sizeof(_sceneShapeTable)); memset(&_sceneScriptData, 0, sizeof(_sceneScriptData)); + _talkObjectList = 0; + _shapeDescTable = 0; + _gfxBackUpRect = 0; + _sceneList = 0; + memset(&_sceneAnimMovie, 0, sizeof(_sceneAnimMovie)); + memset(&_wsaSlots, 0, sizeof(_wsaSlots)); _backUpButtonList = _unknownButtonList = _buttonList = 0; memset(&_buttonShapes, 0, sizeof(_buttonShapes)); diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 194b386ca8..e14e78bc42 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -2638,6 +2638,11 @@ void KyraEngine_v2::seq_uninit() { delete [] _demoShapeDefs; _demoShapeDefs = 0; } + + delete [] _newShapeFiledata; + _newShapeFiledata = 0; + + memset(&_defaultShapeTable, 0, sizeof(_defaultShapeTable)); } #pragma mark - |