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/max.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/max.cpp')
| -rw-r--r-- | engines/lastexpress/entities/max.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/lastexpress/entities/max.cpp b/engines/lastexpress/entities/max.cpp index cecfe64dc6..5c43346cde 100644 --- a/engines/lastexpress/entities/max.cpp +++ b/engines/lastexpress/entities/max.cpp @@ -89,7 +89,8 @@ IMPLEMENT_FUNCTION(6, Max, chapter12_handler) break; case kActionNone: - UPDATE_PARAM(params->param2, getState()->time, params->param1); + if (!Entity::updateParameter(params->param2, getState()->time, params->param1)) + break; if (!getSoundQueue()->isBuffered(kEntityMax)) getSound()->playSound(kEntityMax, "Max1122"); @@ -123,7 +124,8 @@ IMPLEMENT_FUNCTION(7, Max, function7) break; case kActionNone: - UPDATE_PARAM(params->param2, getState()->time, params->param1) + if (!Entity::updateParameter(params->param2, getState()->time, params->param1)) + break; if (!getSoundQueue()->isBuffered(kEntityMax)) getSound()->playSound(kEntityMax, "Max1122"); @@ -212,7 +214,8 @@ IMPLEMENT_FUNCTION(8, Max, chapter4Handler) break; case kActionNone: - UPDATE_PARAM(params->param3, getState()->time, params->param2); + if (!Entity::updateParameter(params->param3, getState()->time, params->param2)) + break; if (!getSoundQueue()->isBuffered(kEntityMax)) getSound()->playSound(kEntityMax, "Max3101"); @@ -390,7 +393,8 @@ IMPLEMENT_FUNCTION(13, Max, chapter3Handler) break; } - UPDATE_PARAM(params->param3, getState()->time, params->param1); + if (!Entity::updateParameter(params->param3, getState()->time, params->param1)) + break; if (!getSoundQueue()->isBuffered(kEntityMax)) getSound()->playSound(kEntityMax, "Max1122"); @@ -512,7 +516,8 @@ IMPLEMENT_FUNCTION(15, Max, function15) } if (!params->param1) { - UPDATE_PARAM(params->param3, getState()->time, 900); + if (!Entity::updateParameter(params->param3, getState()->time, 900)) + break; getSavePoints()->push(kEntityMax, kEntityCoudert, kAction157026693); } |