diff options
author | Evgeny Grechnikov | 2018-09-11 23:14:30 +0300 |
---|---|---|
committer | Evgeny Grechnikov | 2018-09-11 23:14:30 +0300 |
commit | 0cb6b30f67bada2626cbffb8dc0c83c80f3eda63 (patch) | |
tree | 1b28335e2829c45b30c5da41dbf5f4d5c0a5d718 /engines/lastexpress/entities/kronos.cpp | |
parent | 4d36385ccb1fb35b062360193b41ef589d150039 (diff) | |
download | scummvm-rg350-0cb6b30f67bada2626cbffb8dc0c83c80f3eda63.tar.gz scummvm-rg350-0cb6b30f67bada2626cbffb8dc0c83c80f3eda63.tar.bz2 scummvm-rg350-0cb6b30f67bada2626cbffb8dc0c83c80f3eda63.zip |
LASTEXPRESS: more fixes in NPC logic
Diffstat (limited to 'engines/lastexpress/entities/kronos.cpp')
-rw-r--r-- | engines/lastexpress/entities/kronos.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index 60be35e8fa..71ae6dcfa5 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.cpp @@ -589,6 +589,7 @@ IMPLEMENT_FUNCTION(20, Kronos, duringConcert) case 3: getAction()->playAnimation(kEventCathFallingAsleep); + // TODO: fade to black screen while (getSoundQueue()->isBuffered("1919.LNK")) getSoundQueue()->updateQueue(); @@ -696,7 +697,7 @@ IMPLEMENT_FUNCTION(20, Kronos, duringConcert) break; case 2: - getData()->entityPosition = kPosition_6000; + getEntityData(kEntityPlayer)->entityPosition = kPosition_6000; getAction()->playAnimation(kEventConcertLeaveWithBriefcase); RESET_ENTITY_STATE(kEntityKahina, Kahina, setup_concert); @@ -821,7 +822,7 @@ IMPLEMENT_FUNCTION(22, Kronos, awaitingCath) case 1: getAction()->playAnimation(kEventKronosReturnBriefcase); getScenes()->loadSceneFromPosition(kCarKronos, 87); - getInventory()->removeItem(kItemFirebird); + getInventory()->removeItem(kItemBriefcase); getInventory()->removeItem(kItemScarf); setup_finished(); |