diff options
| author | Willem Jan Palenstijn | 2010-04-28 18:50:22 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2010-04-28 18:50:22 +0000 |
| commit | 9793430e58d0a29bbae3da24ab86a14d5504ef23 (patch) | |
| tree | cc9479b3d3d10df89dcaa870b475eda11bd95c17 | |
| parent | 5cb9f7ca2ef01ccf5290dc3aca4f2d13f40ff26a (diff) | |
| download | scummvm-rg350-9793430e58d0a29bbae3da24ab86a14d5504ef23.tar.gz scummvm-rg350-9793430e58d0a29bbae3da24ab86a14d5504ef23.tar.bz2 scummvm-rg350-9793430e58d0a29bbae3da24ab86a14d5504ef23.zip | |
Fix a destruction order issue and note two remaining issues from the label fixes (r48811)
svn-id: r48827
| -rw-r--r-- | engines/parallaction/callables_ns.cpp | 1 | ||||
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp index 6cad03db35..f23b78883a 100644 --- a/engines/parallaction/callables_ns.cpp +++ b/engines/parallaction/callables_ns.cpp @@ -416,6 +416,7 @@ void Parallaction_ns::_c_testResult(void *parm) { _gfx->showLabel(labels[0], CENTER_LABEL_HORIZONTAL, 38); _gfx->showLabel(labels[1], CENTER_LABEL_HORIZONTAL, 58); + // FIXME: this leaks two labels return; } diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index d2cbe86b57..5a97e80208 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -214,7 +214,10 @@ Common::Error Parallaction_ns::init() { Parallaction_ns::~Parallaction_ns() { freeFonts(); + + // TODO: we may want to add a ~Character instead freeCharacter(); + _char._ani.reset(); destroyInventory(); |