diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 13:11:31 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 13:11:31 +0200 |
| commit | 3fe7f2cbe2b70eaa824b7159d94d40c2280006a3 (patch) | |
| tree | ea592da00ad567c75008137f79eeba16c3ba40c4 /engines/lastexpress/game/inventory.cpp | |
| parent | 246109839b9c196e9181a6f619c15694456b9aec (diff) | |
| parent | 10a947a0be80ea8c5c88bd3493a5057b1223ce45 (diff) | |
| download | scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.tar.gz scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.tar.bz2 scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'engines/lastexpress/game/inventory.cpp')
| -rw-r--r-- | engines/lastexpress/game/inventory.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp index 52c00ece31..11e7369ee1 100644 --- a/engines/lastexpress/game/inventory.cpp +++ b/engines/lastexpress/game/inventory.cpp @@ -35,10 +35,8 @@ #include "lastexpress/menu/menu.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" @@ -621,7 +619,7 @@ void Inventory::drawEgg() const { // Blinking egg: we need to blink the egg for delta time, with the blinking getting faster until it's always lit. void Inventory::drawBlinkingEgg(uint ticks) { - uint globalTimer = getGlobalTimer(); + uint globalTimer = (uint)getGlobalTimer(); uint timerValue = (getProgress().jacket == kJacketGreen) ? 450 : 225; if (globalTimer == timerValue || globalTimer == 900) { @@ -655,7 +653,7 @@ void Inventory::drawBlinkingEgg(uint ticks) { } void Inventory::blinkEgg() { - drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, (_blinkingBrightness == 0) ? -1 : _blinkingBrightness); + drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, (_blinkingBrightness == 0) ? -1 : (int16)_blinkingBrightness); askForRedraw(); |