diff options
| author | Julien | 2012-07-23 14:28:41 -0400 |
|---|---|---|
| committer | Julien | 2012-07-27 00:15:00 -0400 |
| commit | 8545991739848d878e61ff058e8fa1326261e634 (patch) | |
| tree | 109b942affed199343d96240354f580054f245a0 /engines/lastexpress/entities/kronos.cpp | |
| parent | e985f7374fd20efc4574bc8320967deef7489d5a (diff) | |
| download | scummvm-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/kronos.cpp')
| -rw-r--r-- | engines/lastexpress/entities/kronos.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index 5dd790ce12..26ce3ca424 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.cpp @@ -126,7 +126,7 @@ IMPLEMENT_FUNCTION(7, Kronos, chapter1) break; case kActionNone: - TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler); + Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Kronos, setup_chapter1Handler)); break; case kActionDefault: @@ -147,7 +147,7 @@ IMPLEMENT_FUNCTION(8, Kronos, chapter1Handler) break; case kActionNone: - TIME_CHECK(kTime1489500, params->param2, setup_function11); + Entity::timeCheck(kTime1489500, params->param2, WRAP_SETUP_FUNCTION(Kronos, setup_function11)); break; case kAction171849314: @@ -189,7 +189,7 @@ IMPLEMENT_FUNCTION(10, Kronos, function10) break; case kActionNone: - TIME_CHECK(kTime1489500, params->param1, setup_function11); + Entity::timeCheck(kTime1489500, params->param1, WRAP_SETUP_FUNCTION(Kronos, setup_function11)); break; case kActionDefault: @@ -405,8 +405,7 @@ IMPLEMENT_FUNCTION(18, Kronos, function18) params->param2 = 1; } - TIME_CHECK(kTime2106000, params->param3, setup_function19) - else { + if (!Entity::timeCheck(kTime2106000, params->param3, WRAP_SETUP_FUNCTION(Kronos, setup_function19))) { if (params->param1 && getEntities()->isInKronosSanctum(kEntityPlayer)) { setCallback(1); setup_savegame(kSavegameTypeEvent, kEventKahinaPunchSuite4); |