diff options
| author | Julien | 2012-07-25 17:55:17 -0400 |
|---|---|---|
| committer | Julien | 2012-07-27 00:15:03 -0400 |
| commit | 938961e23737e5ff19aee61e1ec6dd6e19ca0529 (patch) | |
| tree | e17a171a96f9b781ed0b43f503e1c46ead9b3660 /engines/lastexpress/entities/yasmin.cpp | |
| parent | b6b98483c5117ee3cee0a52607e5f5f4acb7def7 (diff) | |
| download | scummvm-rg350-938961e23737e5ff19aee61e1ec6dd6e19ca0529.tar.gz scummvm-rg350-938961e23737e5ff19aee61e1ec6dd6e19ca0529.tar.bz2 scummvm-rg350-938961e23737e5ff19aee61e1ec6dd6e19ca0529.zip | |
LASTEXPRESS: Remove TIME_CHECK_CALLBACK_1 macro
Diffstat (limited to 'engines/lastexpress/entities/yasmin.cpp')
| -rw-r--r-- | engines/lastexpress/entities/yasmin.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/lastexpress/entities/yasmin.cpp b/engines/lastexpress/entities/yasmin.cpp index acacbb547b..1d280f51e0 100644 --- a/engines/lastexpress/entities/yasmin.cpp +++ b/engines/lastexpress/entities/yasmin.cpp @@ -211,9 +211,11 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler) if (Entity::timeCheckPlaySoundUpdatePosition(kTime1162800, params->param3, 4, "Har1102", kPosition_4070)) break; - TIME_CHECK_CALLBACK_1(kTime1165500, params->param4, 5, setup_playSound, "Har1104"); + if (Entity::timeCheckCallback(kTime1165500, params->param4, 5, "Har1104", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound))) + break; - TIME_CHECK_CALLBACK_1(kTime1174500, params->param5, 6, setup_playSound, "Har1106"); + if (Entity::timeCheckCallback(kTime1174500, params->param5, 6, "Har1106", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound))) + break; Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)); break; @@ -240,11 +242,13 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler) // Fallback to case 4 case 4: - TIME_CHECK_CALLBACK_1(kTime1165500, params->param4, 5, setup_playSound, "Har1104"); + if (Entity::timeCheckCallback(kTime1165500, params->param4, 5, "Har1104", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound))) + break; // Fallback to case 5 case 5: - TIME_CHECK_CALLBACK_1(kTime1174500, params->param5, 6, setup_playSound, "Har1106"); + if (Entity::timeCheckCallback(kTime1174500, params->param5, 6, "Har1106", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound))) + break; // Fallback to case 6 case 6: |