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

[littleboy at users.sourceforge.net]

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

Log Message:
-----------
LASTEXPRESS: Rewrite resetCurrentParameters to use a temporary var

Per LordHoto suggestion, to see if it fixes compilation on motoezx & PS2

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-18 23:54:35 UTC (rev 53597)
+++ scummvm/trunk/engines/lastexpress/entities/entity.h	2010-10-19 00:45:53 UTC (rev 53598)
@@ -368,7 +368,7 @@
 	};
 
 	struct EntityCallParameters {
-		EntityParameters* parameters[4];
+		EntityParameters *parameters[4];
 
 		EntityCallParameters() {
 			// We default to int parameters
@@ -379,10 +379,10 @@
 			clear();
 		}
 
-		template <class parameter>
+		template<class T>
 		void create() {
 			for (int i = 0; i < 4; i++)
-				parameters[i] = new parameter();
+				parameters[i] = new T();
 		}
 
 		void clear() {
@@ -487,10 +487,11 @@
 
 	EntityData() {}
 
-	template <class parameter>
+	template<class T>
 	void resetCurrentParameters() {
-		_parameters[_data.currentCall].clear();
-		_parameters[_data.currentCall].create<parameter>();
+		EntityCallParameters *params = &_parameters[_data.currentCall];
+		params->clear();
+		params->create<T>();
 	}
 
 	EntityCallData 	  *getCallData() { return &_data; }
@@ -545,7 +546,7 @@
 	void nullfunction(const SavePoint &savepoint) {}
 
 protected:
-	LastExpressEngine* _engine;
+	LastExpressEngine *_engine;
 
 	EntityIndex				  _entityIndex;
 	EntityData 				 *_data;


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