diff options
| author | Paul Gilbert | 2017-01-16 07:34:52 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-16 07:34:52 -0500 |
| commit | 70dc84e383bfb4a81785b30ce91f7e089a94c031 (patch) | |
| tree | 2ab742d8640708af8c5c4151b1154e97bb3488e2 /engines/titanic/game/chicken_dispensor.cpp | |
| parent | 480532c2096451cd594cdce944e2345e738039c5 (diff) | |
| download | scummvm-rg350-70dc84e383bfb4a81785b30ce91f7e089a94c031.tar.gz scummvm-rg350-70dc84e383bfb4a81785b30ce91f7e089a94c031.tar.bz2 scummvm-rg350-70dc84e383bfb4a81785b30ce91f7e089a94c031.zip | |
TITANIC: Renamings and cleanup for chicken, sauce, and dispensor
Diffstat (limited to 'engines/titanic/game/chicken_dispensor.cpp')
| -rw-r--r-- | engines/titanic/game/chicken_dispensor.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp index a1070c312a..dd87848456 100644 --- a/engines/titanic/game/chicken_dispensor.cpp +++ b/engines/titanic/game/chicken_dispensor.cpp @@ -77,28 +77,16 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { } } - if (dispenseMode != DISPENSE_NONE) - _dispensed = true; - switch (dispenseMode) { case DISPENSE_NONE: petDisplayMessage(1, ONE_ALLOCATED_CHICKEN_PER_CUSTOMER); break; case DISPENSE_HOT: - setVisible(true); - if (_disabled) { - playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playSound("z#400.wav"); - } else { - playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - _dispensed = true; - } - _dispenseMode = DISPENSE_NONE; - break; - case DISPENSE_COLD: + _dispensed = true; setVisible(true); + if (_disabled) { playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); playSound("z#400.wav"); @@ -106,6 +94,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); _dispensed = true; } + _dispenseMode = DISPENSE_NONE; break; default: |