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/francois.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/francois.cpp')
| -rw-r--r-- | engines/lastexpress/entities/francois.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp index b99dbe466b..e4d401d202 100644 --- a/engines/lastexpress/entities/francois.cpp +++ b/engines/lastexpress/entities/francois.cpp @@ -278,7 +278,7 @@ IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue) case kActionNone: if (!getSoundQueue()->isBuffered(kEntityFrancois)) { - UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->timeTicks, params->param6) + if (Entity::updateParameter(CURRENT_PARAM(1, 1), getState()->timeTicks, params->param6)) { switch (rnd(7)) { default: break; @@ -311,7 +311,7 @@ IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue) params->param6 = 15 * rnd(7); CURRENT_PARAM(1, 1) = 0; - UPDATE_PARAM_PROC_END + } } if (!getEntities()->hasValidFrame(kEntityFrancois) || !getEntities()->isWalkingOppositeToPlayer(kEntityFrancois)) @@ -998,11 +998,11 @@ label_callback_5: } if (params->param5 != kTimeInvalid) { - UPDATE_PARAM_PROC_TIME(kTimeEnd, !getEntities()->isDistanceBetweenEntities(kEntityFrancois, kEntityPlayer, 2000), params->param5, 75); + if (Entity::updateParameterTime(kTimeEnd, !getEntities()->isDistanceBetweenEntities(kEntityFrancois, kEntityPlayer, 2000), params->param5, 75)) { setCallback(6); setup_playSound("Fra2010"); break; - UPDATE_PARAM_PROC_END + } } label_callback_6: |