LASTEXPRESS: Replace TIME_CHECK_CALLBACK_ACTION macro

5 files changed, 15 insertions, 9 deletions

diff --git a/engines/lastexpress/entities/boutarel.cpp b/engines/lastexpress/entities/boutarel.cpp
index 95ec37bf50..ab5f019c49 100644
--- a/engines/lastexpress/entities/boutarel.cpp
+++ b/engines/lastexpress/entities/boutarel.cpp
@@ -476,7 +476,8 @@ IMPLEMENT_FUNCTION_IS(17, Boutarel, function17, TimeValue)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_ACTION(params->param1, params->param6);
+		if (Entity::timeCheckCallbackAction((TimeValue)params->param1, params->param6))
+			break;
 
 		if (params->param5) {
 			UPDATE_PARAM(params->param7, getState()->timeTicks, 90)
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index 4c661a4915..9cb6825f79 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -611,4 +611,14 @@ void Entity::timeCheckObject(TimeValue timeValue, uint &parameter, ObjectIndex o
 	}
 }
 
+bool Entity::timeCheckCallbackAction(TimeValue timeValue, uint &parameter) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		callbackAction();
+		return true;
+	}
+
+	return false;
+}
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 77c3793890..fb5c958464 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -871,6 +871,7 @@ protected:
 
 	void timeCheckSavepoint(TimeValue timeValue, uint &parameter, EntityIndex entity1, EntityIndex entity2, ActionIndex action);
 	void timeCheckObject(TimeValue timeValue, uint &parameter, ObjectIndex index, ObjectLocation location);
+	bool timeCheckCallbackAction(TimeValue timeValue, uint &parameter);
 };
 
 
diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h
index 576765620f..cb4f7b941b 100644
--- a/engines/lastexpress/entities/entity_intern.h
+++ b/engines/lastexpress/entities/entity_intern.h
@@ -347,13 +347,6 @@ void class::setup_##name() { \
 		break; \
 	}
 
-#define TIME_CHECK_CALLBACK_ACTION(timeValue, parameter) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		callbackAction(); \
-		break; \
-	}
-
 #define TIME_CHECK_PLAYSOUND_UPDATEPOSITION(timeValue, parameter, callback, sound, position) \
 	if (getState()->time > timeValue && !parameter) { \
 		parameter = 1; \
diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp
index 877c0c29b3..fe9f6f0aa5 100644
--- a/engines/lastexpress/entities/gendarmes.cpp
+++ b/engines/lastexpress/entities/gendarmes.cpp
@@ -551,7 +551,8 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl
 	case kActionNone:
 		if (checkCallback) {
 			EXPOSE_PARAMS(EntityData::EntityParametersIIII);
-			TIME_CHECK_CALLBACK_ACTION(params->param1, params->param2);
+			if (Entity::timeCheckCallbackAction((TimeValue)params->param1, params->param2))
+				break;
 		}
 
 		if (shouldUpdateEntity) {