diff options
| author | Julien | 2012-07-23 01:15:20 -0400 |
|---|---|---|
| committer | Julien | 2012-07-27 00:14:58 -0400 |
| commit | 8de4cb654782107100aaa3063cac79460546ed67 (patch) | |
| tree | 567a03d423867e847fadce44d3dc494c3537b049 /engines/lastexpress/entities/mmeboutarel.cpp | |
| parent | e13290a0286e86ee5c76f62ad74cb945a22cb38d (diff) | |
| download | scummvm-rg350-8de4cb654782107100aaa3063cac79460546ed67.tar.gz scummvm-rg350-8de4cb654782107100aaa3063cac79460546ed67.tar.bz2 scummvm-rg350-8de4cb654782107100aaa3063cac79460546ed67.zip | |
LASTEXPRESS: Replace UPDATE_PARAM_PROC and UPDATE_PARAM_PROC_TIME macros
Diffstat (limited to 'engines/lastexpress/entities/mmeboutarel.cpp')
| -rw-r--r-- | engines/lastexpress/entities/mmeboutarel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp index 323e686ec3..888adeb372 100644 --- a/engines/lastexpress/entities/mmeboutarel.cpp +++ b/engines/lastexpress/entities/mmeboutarel.cpp @@ -400,7 +400,7 @@ IMPLEMENT_FUNCTION(13, MmeBoutarel, function13) case kActionNone: if (!getSoundQueue()->isBuffered(kEntityMmeBoutarel) && params->param6 != kTimeInvalid) { - UPDATE_PARAM_PROC_TIME(params->param1, !getEntities()->isDistanceBetweenEntities(kEntityMmeBoutarel, kEntityPlayer, 2000), params->param6, 0) + if (Entity::updateParameterTime((TimeValue)params->param1, !getEntities()->isDistanceBetweenEntities(kEntityMmeBoutarel, kEntityPlayer, 2000), params->param6, 0)) { getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal); getObjects()->update(kObject51, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal); @@ -412,16 +412,16 @@ IMPLEMENT_FUNCTION(13, MmeBoutarel, function13) setCallback(1); setup_playSound("MME1037"); break; - UPDATE_PARAM_PROC_END + } } label_callback_1: if (getProgress().field_24 && params->param7 != kTimeInvalid) { - UPDATE_PARAM_PROC_TIME(kTime1093500, (!params->param5 || !getEntities()->isPlayerInCar(kCarRedSleeping)), params->param7, 0) + if (Entity::updateParameterTime(kTime1093500, (!params->param5 || !getEntities()->isPlayerInCar(kCarRedSleeping)), params->param7, 0)) { setCallback(2); setup_function11(); break; - UPDATE_PARAM_PROC_END + } } TIME_CHECK(kTime1094400, params->param8, setup_function14); |