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/ui/ui_object.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/ui/ui_object.cpp')
| -rw-r--r-- | engines/wintermute/ui/ui_object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp index e44bb0f741..9fe9cd18e4 100644 --- a/engines/wintermute/ui/ui_object.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -286,8 +286,8 @@ bool UIObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack j++;
}
- win->_widgets.insertAt(i, this);
- win->_widgets.removeAt(j);
+ win->_widgets.insert_at(i, this);
+ win->_widgets.remove_at(j);
done = true;
stack->pushBool(true);
@@ -318,8 +318,8 @@ bool UIObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack UIWindow *win = (UIWindow *)_parent;
for (int i = 0; i < win->_widgets.getSize(); i++) {
if (win->_widgets[i] == this) {
- win->_widgets.removeAt(i);
- win->_widgets.insertAt(0, this);
+ win->_widgets.remove_at(i);
+ win->_widgets.insert_at(0, this);
break;
}
}
@@ -341,7 +341,7 @@ bool UIObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack UIWindow *win = (UIWindow *)_parent;
for (int i = 0; i < win->_widgets.getSize(); i++) {
if (win->_widgets[i] == this) {
- win->_widgets.removeAt(i);
+ win->_widgets.remove_at(i);
win->_widgets.add(this);
break;
}
|