diff options
| author | Johannes Schickel | 2008-05-06 16:57:07 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-06 16:57:07 +0000 |
| commit | 2976f961fe09c33e350fd8c6b4ccaddad738bf16 (patch) | |
| tree | 2881eb7e2756bb8979bf86dd7a28fe4471e18e0f /engines/kyra/kyra_mr.cpp | |
| parent | bce56298e69704b0f844ab71e8385a3b43b861b2 (diff) | |
| download | scummvm-rg350-2976f961fe09c33e350fd8c6b4ccaddad738bf16.tar.gz scummvm-rg350-2976f961fe09c33e350fd8c6b4ccaddad738bf16.tar.bz2 scummvm-rg350-2976f961fe09c33e350fd8c6b4ccaddad738bf16.zip | |
- Fixed some memory leaks in kyra3
- Fixed valgrind warnings in GUI_v2 code
svn-id: r31902
Diffstat (limited to 'engines/kyra/kyra_mr.cpp')
| -rw-r--r-- | engines/kyra/kyra_mr.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 61546fc2e7..9aa50637d0 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -140,6 +140,7 @@ KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngi _menuDirectlyToLoad = false; _optionsFile = 0; _actorFile = 0; + _chatAltFlag = false; } KyraEngine_MR::~KyraEngine_MR() { @@ -152,6 +153,7 @@ KyraEngine_MR::~KyraEngine_MR() { delete[] _cCodeFile; delete[] _scenesFile; delete[] _itemFile; + delete[] _actorFile; delete[] _gamePlayBuffer; delete[] _interface; delete[] _interfaceCommandLine; @@ -165,7 +167,6 @@ KyraEngine_MR::~KyraEngine_MR() { delete[] _gfxBackUpRect; delete[] _paletteOverlay; - delete[] _sceneList; for (ShapeMap::iterator i = _gameShapes.begin(); i != _gameShapes.end(); ++i) { delete[] i->_value; @@ -552,7 +553,6 @@ void KyraEngine_MR::startup() { _stringBuffer = new char[500]; //XXX musicUpdate(0); - _costPalBuffer = new uint8[864]; //XXX allocAnimObjects(1, 16, 50); @@ -672,7 +672,11 @@ void KyraEngine_MR::startup() { void KyraEngine_MR::loadCostPal() { debugC(9, kDebugLevelMain, "KyraEngine_MR::loadCostPal()"); - _costPalBuffer = _res->fileData("_COSTPAL.DAT", 0); + _res->exists("_COSTPAL.DAT", true); + uint32 size = 0; + _costPalBuffer = _res->fileData("_COSTPAL.DAT", &size); + assert(_costPalBuffer); + assert(size == 864); } void KyraEngine_MR::loadShadowShape() { |