diff options
| author | uruk | 2013-09-21 14:16:32 +0200 |
|---|---|---|
| committer | uruk | 2013-09-21 14:16:32 +0200 |
| commit | 2dcdca571192faebdc1799461fe907fad7087ef3 (patch) | |
| tree | 4e7c6a9f311bb147feccc2eac690ef4c760a2181 | |
| parent | 2df1aa6287b889baa6e545c0448a1d6f92dd7155 (diff) | |
| download | scummvm-rg350-2dcdca571192faebdc1799461fe907fad7087ef3.tar.gz scummvm-rg350-2dcdca571192faebdc1799461fe907fad7087ef3.tar.bz2 scummvm-rg350-2dcdca571192faebdc1799461fe907fad7087ef3.zip | |
AVALANCHE: Silence GCC warnings and repair Scrolls::scrollModeNormal().
| -rw-r--r-- | engines/avalanche/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/graphics.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/gyro.h | 4 | ||||
| -rw-r--r-- | engines/avalanche/scrolls.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index 97624cf1de..aa363bb0a2 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -290,7 +290,7 @@ void Graphics::drawSprite(const SpriteInfo &sprite, byte picnum, int16 x, int16 } } -void Graphics::drawPicture(::Graphics::Surface &target, const ::Graphics::Surface &picture, uint16 destX, uint16 destY) { +void Graphics::drawPicture(::Graphics::Surface &target, ::Graphics::Surface &picture, uint16 destX, uint16 destY) { // Copy the picture to the given place on the screen. for (uint16 y = 0; y < picture.h; y++) { for (uint16 x = 0; x < picture.w; x++) diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h index 4cf338bb3f..de08a9a2c5 100644 --- a/engines/avalanche/graphics.h +++ b/engines/avalanche/graphics.h @@ -86,7 +86,7 @@ public: ::Graphics::Surface loadPictureRow(Common::File &file, uint16 width, uint16 height); // Reads Row-planar EGA data. void drawSprite(const SpriteInfo &sprite, byte picnum, int16 x, int16 y); - void drawPicture(::Graphics::Surface &target, const ::Graphics::Surface &picture, uint16 destX, uint16 destY); // Can't call .free() here. See Lucerna::showscore() for example. + void drawPicture(::Graphics::Surface &target, ::Graphics::Surface &picture, uint16 destX, uint16 destY); // Can't call .free() here. See Lucerna::showscore() for example. void refreshScreen(); void refreshBackground(); diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h index 67ca2cfbd1..99fe6f7142 100644 --- a/engines/avalanche/gyro.h +++ b/engines/avalanche/gyro.h @@ -93,7 +93,7 @@ public: byte _color; }; -typedef byte TuneType[31]; +typedef int8 TuneType[31]; struct QuasipedType { byte _whichPed, _foregroundColor, _room, _backgroundColor; @@ -200,7 +200,7 @@ public: kPitchInvalid, kPitchLower, kPitchSame, - kPitchHigher, + kPitchHigher }; static const uint16 kNotes[12]; diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp index d4462aac17..ca5b515780 100644 --- a/engines/avalanche/scrolls.cpp +++ b/engines/avalanche/scrolls.cpp @@ -118,7 +118,6 @@ void Scrolls::scrollModeNormal() { setReadyLight(3); _vm->_gyro->_seeScroll = true; - CursorMan.showMouse(true); _vm->_gyro->newMouse(3); ::Graphics::Surface temp; @@ -177,7 +176,6 @@ void Scrolls::scrollModeNormal() { setReadyLight(0); _vm->_gyro->_seeScroll = false; - CursorMan.showMouse(false); _vm->_lucerna->_holdLeftMouse = false; // Used in Lucerna::checkclick(). warning("STUB: Scrolls::scrollModeNormal()"); @@ -278,6 +276,8 @@ void Scrolls::scrollModeMusic() { case Common::KEYCODE_RIGHTBRACKET: value = 11; break; + default: + break; } lastOne = thisOne; |