diff options
| author | Julien | 2012-07-22 22:24:27 -0400 |
|---|---|---|
| committer | Julien | 2012-07-27 00:14:56 -0400 |
| commit | 95503250f82c71b4ca6849c5eb5581d3c6645202 (patch) | |
| tree | 1332eecd4de616a0558c00d8d4cf44a1746b21b9 /engines/lastexpress/entities/tatiana.cpp | |
| parent | 2e20e1d1e259dc6d9de8a90fa8417245f5a481b4 (diff) | |
| download | scummvm-rg350-95503250f82c71b4ca6849c5eb5581d3c6645202.tar.gz scummvm-rg350-95503250f82c71b4ca6849c5eb5581d3c6645202.tar.bz2 scummvm-rg350-95503250f82c71b4ca6849c5eb5581d3c6645202.zip | |
LASTEXPRESS: Replace UPDATE_PARAM macro
Diffstat (limited to 'engines/lastexpress/entities/tatiana.cpp')
| -rw-r--r-- | engines/lastexpress/entities/tatiana.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index b15a0a18b2..76068aad24 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.cpp @@ -249,7 +249,8 @@ IMPLEMENT_FUNCTION_I(16, Tatiana, function16, uint32) } if (params->param2) { - UPDATE_PARAM(params->param5, getState()->timeTicks, 75); + if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75)) + break; params->param2 = 0; params->param3 = 1; @@ -443,7 +444,9 @@ label_tatiana_chapter1_2: Entity::timeCheckSavepoint(kTime1084500, params->param7, kEntityTatiana, kEntityPascale, kAction257489762); if (params->param1) { - UPDATE_PARAM(params->param8, getState()->timeTicks, 90); + if (!Entity::updateParameter(params->param8, getState()->timeTicks, 90)) + break; + getScenes()->loadSceneFromPosition(kCarRestaurant, 65); } else { params->param8 = 0; @@ -1292,7 +1295,8 @@ IMPLEMENT_FUNCTION(37, Tatiana, function37) } if (params->param1) { - UPDATE_PARAM(params->param5, getState()->timeTicks, 75); + if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75)) + break; getObjects()->update(kObjectCompartmentB, kEntityTatiana, kObjectLocation1, kCursorNormal, kCursorNormal); getObjects()->update(kObject49, kEntityTatiana, kObjectLocation1, kCursorNormal, kCursorNormal); @@ -1401,7 +1405,8 @@ IMPLEMENT_FUNCTION(38, Tatiana, function38) break; case kActionNone: - UPDATE_PARAM(params->param1, getState()->time, 450); + if (!Entity::updateParameter(params->param1, getState()->time, 450)) + break; getEntities()->exitCompartment(kEntityTatiana, kObjectCompartmentF, true); @@ -2197,7 +2202,8 @@ IMPLEMENT_FUNCTION(54, Tatiana, function54) } if (params->param1 > 3) { - UPDATE_PARAM(params->param3, getState()->timeTicks, 225); + if (!Entity::updateParameter(params->param3, getState()->timeTicks, 225)) + break; params->param1 = 0; params->param3 = 0; |