From 39ad93d738e46a3af8f7bd3c75bbb0ac6e058b11 Mon Sep 17 00:00:00 2001
From: Evgeny Grechnikov
Date: Sat, 25 Aug 2018 15:48:45 +0300
Subject: LASTEXPRESS: fix gcc build

---
 engines/lastexpress/entities/entity.cpp | 4 ++--
 engines/lastexpress/entities/entity.h   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index faf937c3e0..447b556843 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -167,7 +167,7 @@ void EntityData::saveLoadWithSerializer(Common::Serializer &s, const Common::Arr
 
 		for (uint i = 0; i < 8; i++) {
 			if (!paramsTypeSetters || _data.callbacks[i] >= paramsTypeSetters->size())
-				resetParametersType<EntityParametersIIII>(&_parameters[i]);
+				resetParametersType<EntityParametersIIII, EntityParametersIIII, EntityParametersIIII>(&_parameters[i]);
 			else
 				(*paramsTypeSetters)[_data.callbacks[i]](&_parameters[i]);
 		}
@@ -186,7 +186,7 @@ Entity::Entity(LastExpressEngine *engine, EntityIndex index) : _engine(engine),
 
 	// Add first empty entry to callbacks array
 	_callbacks.push_back(NULL);
-	_paramsTypeSetters.push_back(&EntityData::resetParametersType<EntityData::EntityParametersIIII>);
+	_paramsTypeSetters.push_back(&EntityData::resetParametersType<EntityData::EntityParametersIIII, EntityData::EntityParametersIIII, EntityData::EntityParametersIIII>);
 }
 
 Entity::~Entity() {
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 0e01b08830..22bfe6773e 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -78,11 +78,11 @@ struct SavePoint;
 
 #define ADD_CALLBACK_FUNCTION_TYPE(class, name, type) \
 	_callbacks.push_back(new ENTITY_CALLBACK(class, name, this)); \
-	_paramsTypeSetters.push_back(&EntityData::resetParametersType<EntityData::type>);
+	_paramsTypeSetters.push_back(&EntityData::resetParametersType<EntityData::type, EntityData::EntityParametersIIII, EntityData::EntityParametersIIII>);
 
 #define ADD_CALLBACK_FUNCTION_TYPE2(class, name, type1, type2) \
 	_callbacks.push_back(new ENTITY_CALLBACK(class, name, this)); \
-	_paramsTypeSetters.push_back(&EntityData::resetParametersType<EntityData::type1, EntityData::type2>);
+	_paramsTypeSetters.push_back(&EntityData::resetParametersType<EntityData::type1, EntityData::type2, EntityData::EntityParametersIIII>);
 
 #define ADD_CALLBACK_FUNCTION_TYPE3(class, name, type1, type2, type3) \
 	_callbacks.push_back(new ENTITY_CALLBACK(class, name, this)); \
@@ -106,7 +106,7 @@ struct SavePoint;
 
 #define ADD_NULL_FUNCTION() \
 	_callbacks.push_back(new ENTITY_CALLBACK(Entity, nullfunction, this)); \
-	_paramsTypeSetters.push_back(&(EntityData::resetParametersType<EntityData::EntityParametersIIII>));
+	_paramsTypeSetters.push_back(&(EntityData::resetParametersType<EntityData::EntityParametersIIII, EntityData::EntityParametersIIII, EntityData::EntityParametersIIII>));
 
 #define WRAP_SETUP_FUNCTION(className, method) \
 	new Common::Functor0Mem<void, className>(this, &className::method)
@@ -873,7 +873,7 @@ public:
 
 	EntityData() {}
 
-	template<class T1, class T2 = EntityParametersIIII, class T3 = EntityParametersIIII>
+	template<class T1, class T2, class T3>
 	static void resetParametersType(EntityCallParameters* params) {
 		params->clear();
 		params->parameters[0] = new T1();
-- 
cgit v1.2.3