diff options
| author | Littleboy | 2013-11-28 01:15:16 -0500 |
|---|---|---|
| committer | Littleboy | 2013-12-10 01:54:59 -0500 |
| commit | ddcef239432c42b99badab232878e404fa892e01 (patch) | |
| tree | 79ccc3012fcb477191475bbad771e7a6b4706989 /engines/lastexpress/entities/august.cpp | |
| parent | e36786eb1bacc55f0b5ba29ac3278cd3b27a0e59 (diff) | |
| download | scummvm-rg350-ddcef239432c42b99badab232878e404fa892e01.tar.gz scummvm-rg350-ddcef239432c42b99badab232878e404fa892e01.tar.bz2 scummvm-rg350-ddcef239432c42b99badab232878e404fa892e01.zip | |
LASTEXPRESS: Fix enum comparison
Diffstat (limited to 'engines/lastexpress/entities/august.cpp')
| -rw-r--r-- | engines/lastexpress/entities/august.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp index 4b6bceba1f..11f72ecfe8 100644 --- a/engines/lastexpress/entities/august.cpp +++ b/engines/lastexpress/entities/august.cpp @@ -640,7 +640,7 @@ label_continue: break; case 6: - getAction()->playAnimation(getObjects()->get(kObjectCompartment3).model == kObjectLocation1 ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment); + getAction()->playAnimation(getObjects()->get(kObjectCompartment3).model == kObjectModel1 ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment); getProgress().eventMetAugust = true; getObjects()->update(kObjectCompartment3, kEntityAugust, kObjectLocation1, kCursorNormal, kCursorNormal); @@ -879,7 +879,7 @@ label_callback_9: } else { if (getProgress().eventCorpseMovedFromFloor && getProgress().jacket != kJacketBlood) { - params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectLocation1) ? 8 : 7; + params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? 8 : 7; getObjects()->update(kObjectOutsideTylerCompartment, kEntityPlayer, kObjectLocationNone, kCursorKeepValue, kCursorKeepValue); setCallback(4); @@ -912,9 +912,9 @@ label_callback_9: if (params->param3) { getData()->location = kLocationInsideCompartment; - params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectLocation1) ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment; + params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMeetAugustHisCompartmentBed : kEventMeetAugustHisCompartment; } else { - params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectLocation1) ? kEventMeetAugustTylerCompartmentBed : kEventMeetAugustTylerCompartment; + params->param7 = (getObjects()->get(kObjectCompartment1).model == kObjectModel1) ? kEventMeetAugustTylerCompartmentBed : kEventMeetAugustTylerCompartment; } setCallback(14); |