WINTERMUTE: Replace BaseArray with a templated subclass of Common::Array.

This needs additional cleanup, but compiles and runs at this point.

21 files changed, 66 insertions, 66 deletions

diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 68b866bbf5..208d6037d9 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -64,13 +64,13 @@ BaseFrame::~BaseFrame() {
 	for (int i = 0; i < _subframes.getSize(); i++) {

 		delete _subframes[i];

 	}

-	_subframes.removeAll();

+	_subframes.clear();

 

 	for (int i = 0; i < _applyEvent.getSize(); i++) {

 		delete[] _applyEvent[i];

 		_applyEvent[i] = NULL;

 	}

-	_applyEvent.removeAll();

+	_applyEvent.clear();

 }

 

 

@@ -334,7 +334,7 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) {
 

 

 	sub->_editorSelected = editorSelected;

-	_subframes.insertAt(0, sub);

+	_subframes.insert_at(0, sub);

 

 	return STATUS_OK;

 }

@@ -495,7 +495,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac
 			for (int i = 0; i < _subframes.getSize(); i++) {

 				if (_subframes[i] == sub) {

 					delete _subframes[i];

-					_subframes.removeAt(i);

+					_subframes.remove_at(i);

 					break;

 				}

 			}

@@ -550,7 +550,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac
 		if (index >= _subframes.getSize()) {

 			_subframes.add(sub);

 		} else {

-			_subframes.insertAt(index, sub);

+			_subframes.insert_at(index, sub);

 		}

 

 		stack->pushNative(sub, true);

@@ -598,7 +598,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac
 		for (int i = 0; i < _applyEvent.getSize(); i++) {

 			if (scumm_stricmp(_applyEvent[i], event) == 0) {

 				delete[] _applyEvent[i];

-				_applyEvent.removeAt(i);

+				_applyEvent.remove_at(i);

 				break;

 			}

 		}

diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h
index dcbf74bc47..c8e9cbb400 100644
--- a/engines/wintermute/base/base_frame.h
+++ b/engines/wintermute/base/base_frame.h
@@ -51,14 +51,14 @@ public:
 	int _moveY;

 	int _moveX;

 	uint32 _delay;

-	BaseArray<BaseSubFrame *, BaseSubFrame *> _subframes;

+	BaseArray<BaseSubFrame *> _subframes;

 	bool draw(int x, int y, BaseObject *registerOwner = NULL, float zoomX = 100, float zoomY = 100, bool precise = true, uint32 Alpha = 0xFFFFFFFF, bool allFrames = false, float rotate = 0.0f, TSpriteBlendMode blendMode = BLEND_NORMAL);

 	bool loadBuffer(byte *buffer, int lifeTime, bool keepLoaded);

 

 	BaseFrame(BaseGame *inGame);

 	virtual ~BaseFrame();

 

-	BaseArray<const char *, const char *> _applyEvent;

+	BaseArray<const char *> _applyEvent;

 

 	// scripting interface

 	virtual ScValue *scGetProperty(const char *name);

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 41ea01dffd..00f5731787 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -356,9 +356,9 @@ bool BaseGame::cleanup() {
 		delete _regObjects[i];

 		_regObjects[i] = NULL;

 	}

-	_regObjects.removeAll();

+	_regObjects.clear();

 

-	_windows.removeAll(); // refs only

+	_windows.clear(); // refs only

 	_focusedWindow = NULL; // ref only

 

 	delete[] _saveImageName;

@@ -382,7 +382,7 @@ bool BaseGame::cleanup() {
 		_scripts[i]->_owner = NULL;

 		_scripts[i]->finish();

 	}

-	_scripts.removeAll();

+	_scripts.clear();

 

 	_fontStorage->removeFont(_systemFont);

 	_systemFont = NULL;

@@ -393,9 +393,9 @@ bool BaseGame::cleanup() {
 	for (int i = 0; i < _quickMessages.getSize(); i++) {

 		delete _quickMessages[i];

 	}

-	_quickMessages.removeAll();

+	_quickMessages.clear();

 

-	_viewportStack.removeAll();

+	_viewportStack.clear();

 	_viewportSP = -1;

 

 	setName(NULL);

@@ -2906,7 +2906,7 @@ bool BaseGame::displayQuickMsg() {
 	for (int i = 0; i < _quickMessages.getSize(); i++) {

 		if (_currentTime - _quickMessages[i]->_startTime >= QUICK_MSG_DURATION) {

 			delete _quickMessages[i];

-			_quickMessages.removeAt(i);

+			_quickMessages.remove_at(i);

 			i--;

 		}

 	}

@@ -2927,7 +2927,7 @@ bool BaseGame::displayQuickMsg() {
 void BaseGame::quickMessage(const char *text) {

 	if (_quickMessages.getSize() >= MAX_QUICK_MSG) {

 		delete _quickMessages[0];

-		_quickMessages.removeAt(0);

+		_quickMessages.remove_at(0);

 	}

 	_quickMessages.add(new BaseQuickMsg(_gameRef,  text));

 }

@@ -2962,7 +2962,7 @@ bool BaseGame::unregisterObject(BaseObject *object) {
 	// is it a window?

 	for (int i = 0; i < _windows.getSize(); i++) {

 		if ((BaseObject *)_windows[i] == object) {

-			_windows.removeAt(i);

+			_windows.remove_at(i);

 

 			// get new focused window

 			if (_focusedWindow == object) {

@@ -2986,7 +2986,7 @@ bool BaseGame::unregisterObject(BaseObject *object) {
 	// destroy object

 	for (int i = 0; i < _regObjects.getSize(); i++) {

 		if (_regObjects[i] == object) {

-			_regObjects.removeAt(i);

+			_regObjects.remove_at(i);

 			if (!_loadInProgress) {

 				SystemClassRegistry::getInstance()->enumInstances(invalidateValues, "ScValue", (void *)object);

 			}

@@ -3864,7 +3864,7 @@ bool BaseGame::focusWindow(UIWindow *window) {
 	for (int i = 0; i < _windows.getSize(); i++) {

 		if (_windows[i] == window) {

 			if (i < _windows.getSize() - 1) {

-				_windows.removeAt(i);

+				_windows.remove_at(i);

 				_windows.add(window);

 

 				_gameRef->_focusedWindow = window;

diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 08d1869452..ecb698b70a 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -358,10 +358,10 @@ private:
 	bool stopVideo();

 

 	BaseDebugger *_debugMgr;

-	BaseArray<BaseQuickMsg *, BaseQuickMsg *> _quickMessages;

-	BaseArray<UIWindow *, UIWindow *> _windows;

-	BaseArray<BaseViewport *, BaseViewport *> _viewportStack;

-	BaseArray<BaseObject *, BaseObject *> _regObjects;

+	BaseArray<BaseQuickMsg *> _quickMessages;

+	BaseArray<UIWindow *> _windows;

+	BaseArray<BaseViewport *> _viewportStack;

+	BaseArray<BaseObject *> _regObjects;

 

 	AnsiString getDeviceType() const;

 

diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 67cda44ece..13815a5958 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -63,7 +63,7 @@ void BaseRegion::cleanup() {
 	for (int i = 0; i < _points.getSize(); i++) {

 		delete _points[i];

 	}

-	_points.removeAll();

+	_points.clear();

 

 	BasePlatform::setRectEmpty(&_rect);

 	_editorSelectedPoint = -1;

@@ -165,7 +165,7 @@ bool BaseRegion::loadBuffer(byte *buffer, bool complete) {
 	for (i = 0; i < _points.getSize(); i++) {

 		delete _points[i];

 	}

-	_points.removeAll();

+	_points.clear();

 

 	while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

@@ -249,7 +249,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 		int y = stack->pop()->getInt();

 

 		if (Index >= 0 && Index < _points.getSize()) {

-			_points.insertAt(Index, new BasePoint(x, y));

+			_points.insert_at(Index, new BasePoint(x, y));

 			createRegion();

 

 			stack->pushBool(true);

@@ -293,7 +293,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 			delete _points[index];

 			_points[index] = NULL;

 

-			_points.removeAt(index);

+			_points.remove_at(index);

 			createRegion();

 

 			stack->pushBool(true);

diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h
index a15e0cca2a..3b4b28030d 100644
--- a/engines/wintermute/base/base_region.h
+++ b/engines/wintermute/base/base_region.h
@@ -53,7 +53,7 @@ public:
 	bool loadFile(const char *filename);

 	bool loadBuffer(byte *buffer, bool complete = true);

 	Rect32 _rect;

-	BaseArray<BasePoint *, BasePoint *> _points;

+	BaseArray<BasePoint *> _points;

 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent, const char *nameOverride = NULL);

 

 	// scripting interface

diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index b90b4dc60a..131acf326f 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -64,7 +64,7 @@ bool BaseScriptHolder::cleanup() {
 		_scripts[i]->finish(true);

 		_scripts[i]->_owner = NULL;

 	}

-	_scripts.removeAll();

+	_scripts.clear();

 

 	return STATUS_OK;

 }

@@ -336,7 +336,7 @@ bool BaseScriptHolder::addScript(const char *filename) {
 bool BaseScriptHolder::removeScript(ScScript *script) {

 	for (int i = 0; i < _scripts.getSize(); i++) {

 		if (_scripts[i] == script) {

-			_scripts.removeAt(i);

+			_scripts.remove_at(i);

 			break;

 		}

 	}

diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h
index ef1c389dcb..4162936ded 100644
--- a/engines/wintermute/base/base_script_holder.h
+++ b/engines/wintermute/base/base_script_holder.h
@@ -57,7 +57,7 @@ public:
 	bool _freezable;

 	bool _ready;

 

-	BaseArray<ScScript *, ScScript *> _scripts;

+	BaseArray<ScScript *> _scripts;

 	// scripting interface

 	virtual ScValue *scGetProperty(const char *name);

 	virtual bool scSetProperty(const char *name, ScValue *value);

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);

diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index 6ddec287d6..477ab70878 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -75,7 +75,7 @@ public:
 	bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Rect32 *rect = NULL);

 	BaseSprite(BaseGame *inGame, BaseObject *owner = NULL);

 	virtual ~BaseSprite();

-	BaseArray<BaseFrame *, BaseFrame *> _frames;

+	BaseArray<BaseFrame *> _frames;

 	bool saveAsText(BaseDynamicBuffer *buffer, int indent);

 

 	// scripting interface

diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp
index 8b4fa74181..95f1ae601c 100644
--- a/engines/wintermute/base/font/base_font_storage.cpp
+++ b/engines/wintermute/base/font/base_font_storage.cpp
@@ -57,7 +57,7 @@ bool BaseFontStorage::cleanup(bool warn) {
 		}

 		delete _fonts[i];

 	}

-	_fonts.removeAll();

+	_fonts.clear();

 

 	return STATUS_OK;

 }

@@ -117,7 +117,7 @@ bool BaseFontStorage::removeFont(BaseFont *font) {
 			_fonts[i]->_refCount--;

 			if (_fonts[i]->_refCount <= 0) {

 				delete _fonts[i];

-				_fonts.removeAt(i);

+				_fonts.remove_at(i);

 			}

 			break;

 		}

diff --git a/engines/wintermute/base/font/base_font_storage.h b/engines/wintermute/base/font/base_font_storage.h
index 2c9c6817c3..3af9244ffe 100644
--- a/engines/wintermute/base/font/base_font_storage.h
+++ b/engines/wintermute/base/font/base_font_storage.h
@@ -46,7 +46,7 @@ public:
 	BaseFont *addFont(const char *filename);

 	BaseFontStorage(BaseGame *inGame);

 	virtual ~BaseFontStorage();

-	BaseArray<BaseFont *, BaseFont *> _fonts;

+	BaseArray<BaseFont *> _fonts;

 	bool initLoop();

 };

 

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index e14d79cb42..ac6430d4c9 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -72,7 +72,7 @@ BaseFontTT::~BaseFontTT(void) {
 	for (int i = 0; i < _layers.getSize(); i++) {

 		delete _layers[i];

 	}

-	_layers.removeAll();

+	_layers.clear();

 

 	delete[] _fontFile;

 	_fontFile = NULL;

diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index 434fa7100c..20ef531a46 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -142,7 +142,7 @@ public:
 	int _fontHeight;

 	char *_fontFile;

 

-	BaseArray<BaseTTFontLayer *, BaseTTFontLayer *> _layers;

+	BaseArray<BaseTTFontLayer *> _layers;

 	void clearCache();

 

 };

diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index b16fb83abf..8b86365196 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -97,18 +97,18 @@ PartEmitter::~PartEmitter(void) {
 	for (int i = 0; i < _particles.getSize(); i++) {

 		delete _particles[i];

 	}

-	_particles.removeAll();

+	_particles.clear();

 

 	for (int i = 0; i < _forces.getSize(); i++) {

 		delete _forces[i];

 	}

-	_forces.removeAll();

+	_forces.clear();

 

 

 	for (int i = 0; i < _sprites.getSize(); i++) {

 		delete[] _sprites[i];

 	}

-	_sprites.removeAll();

+	_sprites.clear();

 

 	delete[] _emitEvent;

 	_emitEvent = NULL;

@@ -148,7 +148,7 @@ bool PartEmitter::removeSprite(const char *filename) {
 	for (int i = 0; i < _sprites.getSize(); i++) {

 		if (scumm_stricmp(filename, _sprites[i]) == 0) {

 			delete[] _sprites[i];

-			_sprites.removeAt(i);

+			_sprites.remove_at(i);

 			return STATUS_OK;

 		}

 	}

@@ -446,7 +446,7 @@ bool PartEmitter::removeForce(const char *name) {
 	for (int i = 0; i < _forces.getSize(); i++) {

 		if (scumm_stricmp(name, _forces[i]->getName()) == 0) {

 			delete _forces[i];

-			_forces.removeAt(i);

+			_forces.remove_at(i);

 			return STATUS_OK;

 		}

 	}

@@ -527,7 +527,7 @@ bool PartEmitter::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 		for (int i = 0; i < _particles.getSize(); i++) {

 			delete _particles[i];

 		}

-		_particles.removeAll();

+		_particles.clear();

 

 		_running = false;

 		stack->pushBool(true);

diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index fc557a9512..4e3b837a11 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -60,7 +60,7 @@ public:
 	bool addForce(const char *name, PartForce::TForceType type, int posX, int posY, float angle, float strength);

 	bool removeForce(const char *name);

 

-	BaseArray<PartForce *, PartForce *> _forces;

+	BaseArray<PartForce *> _forces;

 

 	// scripting interface

 	virtual ScValue *scGetProperty(const char *name);

@@ -131,8 +131,8 @@ private:
 	bool initParticle(PartParticle *particle, uint32 currentTime, uint32 timerDelta);

 	bool updateInternal(uint32 currentTime, uint32 timerDelta);

 	uint32 _lastGenTime;

-	BaseArray<PartParticle *, PartParticle *> _particles;

-	BaseArray<char *, char *> _sprites;

+	BaseArray<PartParticle *> _particles;

+	BaseArray<char *> _sprites;

 };

 

 } // end of namespace WinterMute

diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h
index ba73e1015f..c343ad24ad 100644
--- a/engines/wintermute/base/scriptables/script.h
+++ b/engines/wintermute/base/scriptables/script.h
@@ -46,7 +46,7 @@ public:
 	bool dbgSendScript(IWmeDebugClient *client);

 	bool dbgSendVariables(IWmeDebugClient *client);

 

-	BaseArray<int, int> _breakpoints;

+	BaseArray<int> _breakpoints;

 	bool _tracingMode;

 

 	ScScript *_parentScript;

diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 356617094d..e1aed7ed82 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -97,7 +97,7 @@ ScEngine::~ScEngine() {
 		delete _breakpoints[i];

 		_breakpoints[i] = NULL;

 	}

-	_breakpoints.removeAll();

+	_breakpoints.clear();

 }

 

 

@@ -108,11 +108,11 @@ bool ScEngine::cleanup() {
 			_scripts[i]->_owner->removeScript(_scripts[i]);

 		}

 		delete _scripts[i];

-		_scripts.removeAt(i);

+		_scripts.remove_at(i);

 		i--;

 	}

 

-	_scripts.removeAll();

+	_scripts.clear();

 

 	delete _globals;

 	_globals = NULL;

@@ -404,7 +404,7 @@ bool ScEngine::removeFinishedScripts() {
 			}

 			_gameRef->getDebugMgr()->onScriptShutdown(_scripts[i]);

 			delete _scripts[i];

-			_scripts.removeAt(i);

+			_scripts.remove_at(i);

 			i--;

 		}

 	}

@@ -511,7 +511,7 @@ void ScEngine::editorCleanup() {
 	for (int i = 0; i < _scripts.getSize(); i++) {

 		if (_scripts[i]->_owner == NULL && (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR)) {

 			delete _scripts[i];

-			_scripts.removeAt(i);

+			_scripts.remove_at(i);

 			i--;

 		}

 	}

@@ -620,10 +620,10 @@ bool ScEngine::removeBreakpoint(const char *scriptFilename, int line) {
 		if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), scriptFilename) == 0) {

 			for (int j = 0; j < _breakpoints[i]->_lines.getSize(); j++) {

 				if (_breakpoints[i]->_lines[j] == line) {

-					_breakpoints[i]->_lines.removeAt(j);

+					_breakpoints[i]->_lines.remove_at(j);

 					if (_breakpoints[i]->_lines.getSize() == 0) {

 						delete _breakpoints[i];

-						_breakpoints.removeAt(i);

+						_breakpoints.remove_at(i);

 					}

 					// refresh changes

 					refreshScriptBreakpoints();

@@ -666,7 +666,7 @@ bool ScEngine::refreshScriptBreakpoints(ScScript *script) {
 		}

 	}

 	if (script->_breakpoints.getSize() > 0) {

-		script->_breakpoints.removeAll();

+		script->_breakpoints.clear();

 	}

 

 	return STATUS_OK;

diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h
index fc441347df..fcfaa51971 100644
--- a/engines/wintermute/base/scriptables/script_engine.h
+++ b/engines/wintermute/base/scriptables/script_engine.h
@@ -74,11 +74,11 @@ public:
 		}

 

 		~CScBreakpoint() {

-			_lines.removeAll();

+			_lines.clear();

 		}

 

 		Common::String _filename;

-		BaseArray<int, int> _lines;

+		BaseArray<int> _lines;

 	};

 

 

@@ -87,7 +87,7 @@ public:
 public:

 	bool dbgSendScripts(IWmeDebugClient *client);

 

-	BaseArray<CScBreakpoint *, CScBreakpoint *> _breakpoints;

+	BaseArray<CScBreakpoint *> _breakpoints;

 	bool addBreakpoint(const char *scriptFilename, int line);

 	bool removeBreakpoint(const char *scriptFilename, int line);

 	bool refreshScriptBreakpoints();

@@ -122,7 +122,7 @@ public:
 	static void closeFile(void *data, byte *buffer);

 	static void parseElement(void *data, int line, int type, void *elementData);

 

-	BaseArray<ScScript *, ScScript *> _scripts;

+	BaseArray<ScScript *> _scripts;

 

 	void enableProfiling();

 	void disableProfiling();

diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
index 0d4ea54b8c..8840a2c0f1 100644
--- a/engines/wintermute/base/scriptables/script_stack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -50,7 +50,7 @@ ScStack::~ScStack() {
 	for (int i = 0; i < _values.getSize(); i++) {

 		delete _values[i];

 	}

-	_values.removeAll();

+	_values.clear();

 }

 

 

@@ -123,7 +123,7 @@ void ScStack::correctParams(uint32 expectedParams) {
 		while (expectedParams < nuParams) {

 			//Pop();

 			delete _values[_sP - expectedParams];

-			_values.removeAt(_sP - expectedParams);

+			_values.remove_at(_sP - expectedParams);

 			nuParams--;

 			_sP--;

 		}

@@ -132,13 +132,13 @@ void ScStack::correctParams(uint32 expectedParams) {
 			//Push(null_val);

 			ScValue *nullVal = new ScValue(_gameRef);

 			nullVal->setNULL();

-			_values.insertAt(_sP - nuParams + 1, nullVal);

+			_values.insert_at(_sP - nuParams + 1, nullVal);

 			nuParams++;

 			_sP++;

 

 			if (_values.getSize() > _sP + 1) {

 				delete _values[_values.getSize() - 1];

-				_values.removeAt(_values.getSize() - 1);

+				_values.remove_at(_values.getSize() - 1);

 			}

 		}

 	}

diff --git a/engines/wintermute/base/scriptables/script_stack.h b/engines/wintermute/base/scriptables/script_stack.h
index 3aacad0765..95839cc680 100644
--- a/engines/wintermute/base/scriptables/script_stack.h
+++ b/engines/wintermute/base/scriptables/script_stack.h
@@ -56,7 +56,7 @@ public:
 	ScValue *pop();

 	ScStack(BaseGame *inGame);

 	virtual ~ScStack();

-	BaseArray<ScValue *, ScValue *> _values;

+	BaseArray<ScValue *> _values;

 	int _sP;

 

 };