diff options
author | Einar Johan Trøan Sømåen | 2012-07-26 19:41:18 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-26 19:41:18 +0200 |
commit | 4eda234611bd77f053defe9e61d592b308270eaa (patch) | |
tree | cb0a437641b74b60b325ac9ccaa9b63dacab897d /engines/wintermute/base/base_sprite.cpp | |
parent | eb22e36d5e12b64442ce23c656227483dd9cf61e (diff) | |
download | scummvm-rg350-4eda234611bd77f053defe9e61d592b308270eaa.tar.gz scummvm-rg350-4eda234611bd77f053defe9e61d592b308270eaa.tar.bz2 scummvm-rg350-4eda234611bd77f053defe9e61d592b308270eaa.zip |
WINTERMUTE: Replace BaseArray with a templated subclass of Common::Array.
This needs additional cleanup, but compiles and runs at this point.
Diffstat (limited to 'engines/wintermute/base/base_sprite.cpp')
-rw-r--r-- | engines/wintermute/base/base_sprite.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 2fda638665..274c792263 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -92,7 +92,7 @@ void BaseSprite::cleanup() { for (int i = 0; i < _frames.getSize(); i++) {
delete _frames[i];
}
- _frames.removeAll();
+ _frames.clear();
delete[] _editorBgFile;
_editorBgFile = NULL;
@@ -578,7 +578,7 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta _lastFrameTime = 0;
}
delete _frames[i];
- _frames.removeAt(i);
+ _frames.remove_at(i);
break;
}
}
@@ -653,7 +653,7 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta if (index >= _frames.getSize()) {
_frames.add(frame);
} else {
- _frames.insertAt(index, frame);
+ _frames.insert_at(index, frame);
}
stack->pushNative(frame, true);
|