diff options
| author | Evgeny Grechnikov | 2018-09-24 01:57:44 +0300 |
|---|---|---|
| committer | Evgeny Grechnikov | 2018-09-24 01:57:44 +0300 |
| commit | f057ac75ce86db465a75193a40358b3226bcf099 (patch) | |
| tree | 3fdab724ef78fa76864a4ff241203a52cc12cdcb /engines/lastexpress/entities/tatiana.cpp | |
| parent | 875ce8101c9c67d7c38bad9ddc263a46eb0c758a (diff) | |
| download | scummvm-rg350-f057ac75ce86db465a75193a40358b3226bcf099.tar.gz scummvm-rg350-f057ac75ce86db465a75193a40358b3226bcf099.tar.bz2 scummvm-rg350-f057ac75ce86db465a75193a40358b3226bcf099.zip | |
LASTEXPRESS: more fixes in NPC logic
Diffstat (limited to 'engines/lastexpress/entities/tatiana.cpp')
| -rw-r--r-- | engines/lastexpress/entities/tatiana.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index 5dd61e3f46..31de491983 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.cpp @@ -209,7 +209,7 @@ IMPLEMENT_FUNCTION(15, Tatiana, exitCompartment) case kActionDefault: setCallback(getProgress().chapter == kChapter1 ? 1 : 2); - setup_enterExitCompartment2(getProgress().chapter == kChapter1 ? "603Bb" : "673Bb", kObjectCompartmentB); + setup_enterExitCompartment(getProgress().chapter == kChapter1 ? "603Bb" : "673Bb", kObjectCompartmentB); break; case kActionCallback: @@ -615,8 +615,7 @@ IMPLEMENT_FUNCTION(22, Tatiana, getSomeAir) if (params->param1 == kTimeInvalid || getState()->time <= kTime1179000) goto label_update; - if (Entity::updateParameterTime(kTime1233000, ((!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch)) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)) { - params->param1 = kTimeInvalid; + if (!Entity::updateParameterTime(kTime1233000, ((!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch)) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)) { label_update: if (!getEvent(kEventTatianaAskMatchSpeakRussian) @@ -1036,6 +1035,7 @@ IMPLEMENT_FUNCTION(32, Tatiana, playChess) break; case kActionEndSound: + parameters->param2 = 0; ++parameters->param3; switch (parameters->param3) { @@ -1200,7 +1200,7 @@ IMPLEMENT_FUNCTION(35, Tatiana, concert) label_callback_1: if (getState()->time > kTime2133000) { - if (getData()->car >= kCarRedSleeping || (getData()->car == kCarGreenSleeping && getData()->entityPosition > kPosition_5790)) + if (getEntityData(kEntityAugust)->car >= kCarRedSleeping || (getEntityData(kEntityAugust)->car == kCarGreenSleeping && getEntityData(kEntityAugust)->entityPosition > kPosition_5790)) setup_leaveConcert(); } break; |