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/mertens.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/mertens.cpp')
| -rw-r--r-- | engines/lastexpress/entities/mertens.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index b6ea86cd0e..97dd293793 100644 --- a/engines/lastexpress/entities/mertens.cpp +++ b/engines/lastexpress/entities/mertens.cpp @@ -3532,14 +3532,16 @@ label_callback_5: } label_callback_6: - TIME_CHECK_CALLBACK_1(kTime1971000, params->param1, 7, setup_function28, "CON3012"); + if (Entity::timeCheckCallback(kTime1971000, params->param1, 7, "CON3012", WRAP_SETUP_FUNCTION_S(Mertens, setup_function28))) + break; label_callback_7: if (Entity::timeCheckCallback(kTime2117700, params->param2, 8, WRAP_SETUP_FUNCTION(Mertens, setup_function32))) break; label_callback_8: - TIME_CHECK_CALLBACK_1(kTime2124000, params->param3, 9, setup_function28, "CON2010"); + if (Entity::timeCheckCallback(kTime2124000, params->param3, 9, "CON2010", WRAP_SETUP_FUNCTION_S(Mertens, setup_function28))) + break; label_callback_9: if (Entity::timeCheckCallback(kTime2146500, params->param4, 10, WRAP_SETUP_FUNCTION(Mertens, setup_function32))) |