aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authoruruk2014-05-13 07:49:28 +0200
committeruruk2014-05-13 07:49:28 +0200
commit631e9ef37e0bfd40deca4ee95a4a2186695434eb (patch)
tree55769c3e6640b860b007c4e9b5ef5730778f6d7b /engines
parent18182d5d2b75a42ff453aaa9ad6f60eb54bc898c (diff)
downloadscummvm-rg350-631e9ef37e0bfd40deca4ee95a4a2186695434eb.tar.gz
scummvm-rg350-631e9ef37e0bfd40deca4ee95a4a2186695434eb.tar.bz2
scummvm-rg350-631e9ef37e0bfd40deca4ee95a4a2186695434eb.zip
CGE2: Fix Spare.
Diffstat (limited to 'engines')
-rw-r--r--engines/cge2/spare.cpp4
-rw-r--r--engines/cge2/spare.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge2/spare.cpp b/engines/cge2/spare.cpp
index 9a50f51900..1bc4f47e78 100644
--- a/engines/cge2/spare.cpp
+++ b/engines/cge2/spare.cpp
@@ -34,11 +34,11 @@ void Spare::synchronize() {
}
void Spare::clear() {
+ for (int i = 0; i < _container.size(); i++)
+ delete _container[i];
_container.clear();
}
-Spare::Spare(CGE2Engine *vm) : _vm(vm) {}
-
Sprite *Spare::take(int ref) {
for (int i = 0; i < _container.size(); i++) {
if (_container[i]->_ref == ref) {
diff --git a/engines/cge2/spare.h b/engines/cge2/spare.h
index 3fc7ecfc94..cf0c29bfd4 100644
--- a/engines/cge2/spare.h
+++ b/engines/cge2/spare.h
@@ -37,14 +37,14 @@ class Spare {
Common::Array<Sprite*> _container;
public:
void make(Sprite *spr);
- Spare(CGE2Engine *vm);
+ Spare(CGE2Engine *vm) : _vm(vm) {}
Sprite *take(int ref);
void takeCave(int cav);
void dispose(Sprite *spr);
void dispose(int ref);
void dispose();
void synchronize();
- uint16 count() { _container.size(); }
+ uint16 count() { return _container.size(); }
void clear();
};