aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/entities/august.cpp
diff options
context:
space:
mode:
authorJulien2012-07-23 14:28:41 -0400
committerJulien2012-07-27 00:15:00 -0400
commit8545991739848d878e61ff058e8fa1326261e634 (patch)
tree109b942affed199343d96240354f580054f245a0 /engines/lastexpress/entities/august.cpp
parente985f7374fd20efc4574bc8320967deef7489d5a (diff)
downloadscummvm-rg350-8545991739848d878e61ff058e8fa1326261e634.tar.gz
scummvm-rg350-8545991739848d878e61ff058e8fa1326261e634.tar.bz2
scummvm-rg350-8545991739848d878e61ff058e8fa1326261e634.zip
LASTEXPRESS: Remove several TIME_CHECK* macros
Diffstat (limited to 'engines/lastexpress/entities/august.cpp')
-rw-r--r--engines/lastexpress/entities/august.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp
index e863fe1d87..0412da69ac 100644
--- a/engines/lastexpress/entities/august.cpp
+++ b/engines/lastexpress/entities/august.cpp
@@ -752,7 +752,7 @@ IMPLEMENT_FUNCTION(22, August, chapter1)
break;
case kActionNone:
- TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+ Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(August, setup_chapter1Handler));
break;
case kActionDefault:
@@ -1966,7 +1966,7 @@ IMPLEMENT_FUNCTION(38, August, function38)
case kActionNone:
Entity::timeCheckSavepoint(kTime1801800, params->param1, kEntityAugust, kEntityRebecca, kAction155980128);
- TIME_CHECK_CALLBACK(kTime1820700, params->param2, 3, setup_callbackActionRestaurantOrSalon);
+ Entity::timeCheckCallback(kTime1820700, params->param2, 3, WRAP_SETUP_FUNCTION(August, setup_callbackActionRestaurantOrSalon));
break;
case kActionDefault:
@@ -2404,7 +2404,7 @@ IMPLEMENT_FUNCTION_END
IMPLEMENT_FUNCTION(46, August, function46)
switch (savepoint.action) {
default:
- TIME_CHECK_CALLBACK(kTime2088000, params->param1, 1, setup_function47);
+ Entity::timeCheckCallback(kTime2088000, params->param1, 1, WRAP_SETUP_FUNCTION(August, setup_function47));
break;
case kActionNone:
@@ -2489,7 +2489,7 @@ IMPLEMENT_FUNCTION(48, August, function48)
break;
case kActionNone:
- TIME_CHECK(kTimeCityLinz, params->param1, setup_function49);
+ Entity::timeCheck(kTimeCityLinz, params->param1, WRAP_SETUP_FUNCTION(August, setup_function49));
break;
case kActionKnock: