diff options
| author | Littleboy | 2011-06-24 10:56:49 -0400 |
|---|---|---|
| committer | Littleboy | 2011-06-24 10:56:49 -0400 |
| commit | 5d020fffad44c78414b91de7c26653b11b78b60f (patch) | |
| tree | 50899050b92b6e30f8bda0204d923c89aa5c7416 /engines/lastexpress/game/entities.cpp | |
| parent | 08375150ca0b4719ddda7932d5f5061fff225a28 (diff) | |
| download | scummvm-rg350-5d020fffad44c78414b91de7c26653b11b78b60f.tar.gz scummvm-rg350-5d020fffad44c78414b91de7c26653b11b78b60f.tar.bz2 scummvm-rg350-5d020fffad44c78414b91de7c26653b11b78b60f.zip | |
LASTEXPRESS: Refactor Sound class
- Move entry-related functions to separate class
- Move enumeration to shared header and rename FlagType to SoundFlag
Diffstat (limited to 'engines/lastexpress/game/entities.cpp')
| -rw-r--r-- | engines/lastexpress/game/entities.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp index 513ad114b0..0fa3af36b7 100644 --- a/engines/lastexpress/game/entities.cpp +++ b/engines/lastexpress/game/entities.cpp @@ -299,7 +299,7 @@ void Entities::setupChapter(ChapterIndex chapter) { memset(&_compartments1, 0, sizeof(_compartments1)); memset(&_positions, 0, sizeof(_positions)); - getSound()->resetQueue(SoundManager::kSoundType13); + getSound()->resetQueue(kSoundType13); } // we skip the header when doing entity setup @@ -2355,7 +2355,7 @@ bool Entities::changeCar(EntityData::EntityCallData *data, EntityIndex entity, C if (data->car == newCar) { if (isInGreenCarEntrance(kEntityPlayer)) { getSound()->playSoundEvent(kEntityPlayer, 14); - getSound()->excuseMe(entity, kEntityPlayer, SoundManager::kFlagDefault); + getSound()->excuseMe(entity, kEntityPlayer, kFlagDefault); getScenes()->loadSceneFromPosition(kCarGreenSleeping, 1); getSound()->playSound(kEntityPlayer, "CAT1127A"); getSound()->playSoundEvent(kEntityPlayer, 15); @@ -2374,7 +2374,7 @@ bool Entities::changeCar(EntityData::EntityCallData *data, EntityIndex entity, C if (data->car == newCar) { if (isInKronosCarEntrance(kEntityPlayer)) { getSound()->playSoundEvent(kEntityPlayer, 14); - getSound()->excuseMe(entity, kEntityPlayer, SoundManager::kFlagDefault); + getSound()->excuseMe(entity, kEntityPlayer, kFlagDefault); getScenes()->loadSceneFromPosition(kCarGreenSleeping, 62); getSound()->playSound(kEntityPlayer, "CAT1127A"); getSound()->playSoundEvent(kEntityPlayer, 15); |