LASTEXPRESS: Move RESET_ENTITY_STATE macro to entity.h

scummvm · Jul 27, 2012 · 7450ae2 · 7450ae2
1 parent 7974b62
commit 7450ae2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
 //////////////////////////////////////////////////////////////////////////