diff options
| author | Nicola Mettifogo | 2007-03-18 10:34:41 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-18 10:34:41 +0000 |
| commit | 13385a5f2d22870417ec07334ae0836d4fac12a7 (patch) | |
| tree | 183422444908f05171ead2c81c74ce84819a4d01 /engines/parallaction/parallaction.cpp | |
| parent | 8f74bc15aef1c56b29d21bf3aa7e8e51687b98ae (diff) | |
| download | scummvm-rg350-13385a5f2d22870417ec07334ae0836d4fac12a7.tar.gz scummvm-rg350-13385a5f2d22870417ec07334ae0836d4fac12a7.tar.bz2 scummvm-rg350-13385a5f2d22870417ec07334ae0836d4fac12a7.zip | |
Made loadObjects return a new Cnv instead of accepting a parameter.
svn-id: r26202
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 41a0e2eddb..3c257677b3 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -732,7 +732,8 @@ void freeCharacter() { _vm->_gfx->freeStaticCnv(_vm->_char._head); if (_vm->_char._head) delete _vm->_char._head; - _vm->_gfx->freeCnv(&_vm->_char._objs); + _vm->_gfx->freeCnv(_vm->_char._objs); + if (_vm->_char._objs) delete _vm->_char._objs; } return; @@ -811,7 +812,7 @@ void Parallaction::changeCharacter(const char *name) { if (!IS_DUMMY_CHARACTER(name)) { _vm->_char._head = _disk->loadHead(path); _vm->_char._talk = _disk->loadTalk(path); - _disk->loadObjects(name, &_vm->_char._objs); + _vm->_char._objs = _disk->loadObjects(name); sprintf(path, "mini%s", v32); _disk->loadFrames(path, &_vm->_char._miniFrames); |