diff options
Diffstat (limited to 'engines/lastexpress/entities/hadija.cpp')
| -rw-r--r-- | engines/lastexpress/entities/hadija.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/engines/lastexpress/entities/hadija.cpp b/engines/lastexpress/entities/hadija.cpp index eb255d77f8..d925dd1163 100644 --- a/engines/lastexpress/entities/hadija.cpp +++ b/engines/lastexpress/entities/hadija.cpp @@ -34,10 +34,10 @@ namespace LastExpress { Hadija::Hadija(LastExpressEngine *engine) : Entity(engine, kEntityHadija) { ADD_CALLBACK_FUNCTION(Hadija, reset); - ADD_CALLBACK_FUNCTION(Hadija, enterExitCompartment); - ADD_CALLBACK_FUNCTION(Hadija, playSound); - ADD_CALLBACK_FUNCTION(Hadija, updateFromTime); - ADD_CALLBACK_FUNCTION(Hadija, updateEntity); + ADD_CALLBACK_FUNCTION_SI(Hadija, enterExitCompartment); + ADD_CALLBACK_FUNCTION_S(Hadija, playSound); + ADD_CALLBACK_FUNCTION_I(Hadija, updateFromTime); + ADD_CALLBACK_FUNCTION_II(Hadija, updateEntity); ADD_CALLBACK_FUNCTION(Hadija, peekF); ADD_CALLBACK_FUNCTION(Hadija, peekH); ADD_CALLBACK_FUNCTION(Hadija, goFtoH); @@ -151,15 +151,15 @@ label_callback2: return; } } - - if (params->param3 >= getState()->time) - return; } + if (getState()->time > kTime1134000 || getState()->time > params->param3) { - params->param3 = kTimeInvalid; + params->param3 = kTimeInvalid; - setCallback(3); - setup_peekH(); + setCallback(3); + setup_peekH(); + break; + } } label_callback3: @@ -343,10 +343,6 @@ label_callback4: } break; - case kActionDefault: - getSavePoints()->push(kEntityAlouan, kEntityTrain, kAction191070912, kPosition_4840); - break; - case kActionCallback: switch (getCallback()) { default: |