LASTEXPRESS: Remove TIME_CHECK_CALLBACK_1 macro

1 files changed, 24 insertions, 0 deletions

diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index 48856a7bc4..9160b6db95 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -660,6 +660,30 @@ bool Entity::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callba
 	return false;
 }
 
+bool Entity::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, const char *str, Common::Functor1<const char *, void> *function) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		(*function)(str);
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, bool check, Common::Functor1<bool, void> *function) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		(*function)(check);
+
+		return true;
+	}
+
+	return false;
+}
+
 bool Entity::timeCheckCallbackInventory(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function) {
 	if (getState()->time > timeValue && !parameter) {
 		parameter = 1;