From fdaa1b9c613fd5a1eae81652879f7bdb45c51be6 Mon Sep 17 00:00:00 2001
From: Julien Templier
Date: Tue, 19 Oct 2010 01:42:00 +0000
Subject: LASTEXPRESS: Merge parameter creation into resetCurrentParameters()

svn-id: r53599
---
 engines/lastexpress/entities/entity.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'engines/lastexpress')

diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 881902ae80..22ebaad1ca 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -372,19 +372,14 @@ public:
 
 		EntityCallParameters() {
 			// We default to int parameters
-			create<EntityParametersIIII>();
+			for (int i = 0; i < 4; i++)
+				parameters[i] = new EntityParametersIIII();
 		}
 
 		~EntityCallParameters() {
 			clear();
 		}
 
-		template<class T>
-		void create() {
-			for (int i = 0; i < 4; i++)
-				parameters[i] = new T();
-		}
-
 		void clear() {
 			for (int i = 0; i < 4; i++) {
 				if (parameters[i])
@@ -491,7 +486,9 @@ public:
 	void resetCurrentParameters() {
 		EntityCallParameters *params = &_parameters[_data.currentCall];
 		params->clear();
-		params->create<T>();
+
+		for (int i = 0; i < 4; i++)
+			params->parameters[i] = new T();
 	}
 
 	EntityCallData 	  *getCallData() { return &_data; }
-- 
cgit v1.2.3