From 4eda234611bd77f053defe9e61d592b308270eaa Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Thu, 26 Jul 2012 19:41:18 +0200
Subject: WINTERMUTE: Replace BaseArray with a templated subclass of
 Common::Array.

This needs additional cleanup, but compiles and runs at this point.
---
 engines/wintermute/base/particles/part_emitter.cpp | 12 ++++++------
 engines/wintermute/base/particles/part_emitter.h   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/wintermute/base/particles')

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
-- 
cgit v1.2.3