diff options
author | Paul Gilbert | 2011-07-10 18:17:40 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-07-10 18:17:40 +1000 |
commit | 66c7777dfedd4ec7a251b4a47e9b581a3e7570d4 (patch) | |
tree | 99f8cc4a76307077d2c033c2455e8a283d7cc18b /engines | |
parent | 32c8962d62162e79f5c27fbf2b5bbc843be4ad92 (diff) | |
download | scummvm-rg350-66c7777dfedd4ec7a251b4a47e9b581a3e7570d4.tar.gz scummvm-rg350-66c7777dfedd4ec7a251b4a47e9b581a3e7570d4.tar.bz2 scummvm-rg350-66c7777dfedd4ec7a251b4a47e9b581a3e7570d4.zip |
CGE: Fix Valgrind identified errors
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cge/vga13h.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index 526faed566..9498b04e8c 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -362,8 +362,6 @@ Sprite::Sprite(CGEEngine *vm, BMP_PTR *shpP) Sprite::~Sprite() { - if (_sprite == this) - _sprite = NULL; contract(); } @@ -405,6 +403,7 @@ BMP_PTR *Sprite::setShapeList(BMP_PTR *shpP) { } expand(); _ext->_shpList = shpP; + _flags._bDel = true; if (!_ext->_seq) setSeq((_shpCnt < 2) ? _seq1 : _seq2); } @@ -907,14 +906,8 @@ template<typename T> inline bool contains(const Common::List<T> &l, const T &v) { return (Common::find(l.begin(), l.end(), v) != l.end()); } -Common::List<Sprite *> l; Sprite *Queue::remove(Sprite *spr) { - if (contains(l, spr)) { - debug("N"); - } - l.push_back(spr); - if (spr == _head) _head = spr->_next; if (spr == _tail) |