[Scummvm-cvs-logs] SF.net SVN: scummvm:[53599] scummvm/trunk/engines/lastexpress/entities/ entity.h

[littleboy at users.sourceforge.net]

Revision: 53599
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53599&view=rev
Author:   littleboy
Date:     2010-10-19 01:42:00 +0000 (Tue, 19 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Merge parameter creation into resetCurrentParameters()

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/entities/entity.h

Modified: scummvm/trunk/engines/lastexpress/entities/entity.h
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/entity.h	2010-10-19 00:45:53 UTC (rev 53598)
+++ scummvm/trunk/engines/lastexpress/entities/entity.h	2010-10-19 01:42:00 UTC (rev 53599)
@@ -372,19 +372,14 @@
 
 		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 @@
 	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; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.