From 7450ae23fb3c7afcaa33a35390e4c2c03238a024 Mon Sep 17 00:00:00 2001
From: Julien
Date: Tue, 24 Jul 2012 22:24:59 -0400
Subject: LASTEXPRESS: Move RESET_ENTITY_STATE macro to entity.h

---
 engines/lastexpress/entities/entity.h        | 8 ++++++++
 engines/lastexpress/entities/entity_intern.h | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 6e55e21b74..785e355481 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -94,6 +94,14 @@ struct SavePoint;
 #define ENTITY_PARAM(index, id) \
 	((EntityData::EntityParametersIIII*)_data->getParameters(8, index))->param##id
 
+//////////////////////////////////////////////////////////////////////////
+// Misc
+//////////////////////////////////////////////////////////////////////////
+#define RESET_ENTITY_STATE(entity, class, function) \
+	getEntities()->resetState(entity); \
+	((class *)getEntities()->get(entity))->function();
+
+
 
 //////////////////////////////////////////////////////////////////////////
 class EntityData : Common::Serializable {
diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h
index 1d6c462a88..306dbf8376 100644
--- a/engines/lastexpress/entities/entity_intern.h
+++ b/engines/lastexpress/entities/entity_intern.h
@@ -259,13 +259,6 @@ void class::setup_##name() { \
 	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %s, %s) - action: %s", params->param1, params->param2, (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
 
 
-//////////////////////////////////////////////////////////////////////////
-// Misc
-//////////////////////////////////////////////////////////////////////////
-#define RESET_ENTITY_STATE(entity, class, function) \
-	getEntities()->resetState(entity); \
-	((class *)getEntities()->get(entity))->function();
-
 //////////////////////////////////////////////////////////////////////////
 // Time check macros
 //////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3