diff options
author | uruk | 2013-09-05 10:51:47 +0200 |
---|---|---|
committer | uruk | 2013-09-05 10:51:47 +0200 |
commit | 0c47dc858af4fda4f01939f67f6bb4fc746db674 (patch) | |
tree | 52a42c34c17341dbc2859615ca0f69991a2dffdc | |
parent | c0d9677979c6fdc6272a49957f617f282363078a (diff) | |
download | scummvm-rg350-0c47dc858af4fda4f01939f67f6bb4fc746db674.tar.gz scummvm-rg350-0c47dc858af4fda4f01939f67f6bb4fc746db674.tar.bz2 scummvm-rg350-0c47dc858af4fda4f01939f67f6bb4fc746db674.zip |
AVALANCHE: Fix GCC warning.
-rw-r--r-- | engines/avalanche/celer2.cpp | 2 | ||||
-rw-r--r-- | engines/avalanche/celer2.h | 2 | ||||
-rw-r--r-- | engines/avalanche/graphics.cpp | 6 | ||||
-rw-r--r-- | engines/avalanche/graphics.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer2.cpp index 5c95acabe5..0094fa5616 100644 --- a/engines/avalanche/celer2.cpp +++ b/engines/avalanche/celer2.cpp @@ -371,7 +371,7 @@ void Celer::drawBackgroundSprite(int16 destX, int16 destY, byte which) { -void Celer::drawSprite(int16 x, int16 y, const SpriteType &sprite) { +void Celer::drawSprite(int16 x, int16 y, SpriteType &sprite) { _r.x1 = x; _r.y1 = y; _r.y2 = y + sprite._yl; diff --git a/engines/avalanche/celer2.h b/engines/avalanche/celer2.h index a4cd0eb675..090eda2d90 100644 --- a/engines/avalanche/celer2.h +++ b/engines/avalanche/celer2.h @@ -73,7 +73,7 @@ private: Common::String _filename; static const int16 kOnDisk; // Value of memos[fv].x when it's not in memory. - void drawSprite(int16 x, int16 y, const SpriteType &sprite); + void drawSprite(int16 x, int16 y, SpriteType &sprite); }; } // End of namespace Avalanche. diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index 92bffc2976..0546ca5967 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -39,7 +39,7 @@ namespace Avalanche { -const byte Graphics::_egaPaletteIndex[16] = {0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63}; +const byte Graphics::kEgaPaletteIndex[16] = {0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63}; @@ -57,7 +57,7 @@ void Graphics::init() { } for (byte i = 0; i < 16; i++) - g_system->getPaletteManager()->setPalette(_egaPalette[_egaPaletteIndex[i]], i, 1); + g_system->getPaletteManager()->setPalette(_egaPalette[kEgaPaletteIndex[i]], i, 1); _surface.create(kScreenWidth, kScreenHeight, ::Graphics::PixelFormat::createFormatCLUT8()); @@ -309,7 +309,7 @@ void Graphics::drawText(::Graphics::Surface &surface, const Common::String &text return picture; } -void Graphics::drawPicture(const ::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 4c812fb7de..ac9e8bf91d 100644 --- a/engines/avalanche/graphics.h +++ b/engines/avalanche/graphics.h @@ -115,7 +115,7 @@ public: ::Graphics::Surface loadPictureRow(Common::File &file, uint16 width, uint16 height); // Reads Row-planar EGA data. // Further information about these two: http://www.shikadi.net/moddingwiki/Raw_EGA_data - void drawPicture(const ::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(); @@ -124,7 +124,7 @@ public: private: AvalancheEngine *_vm; - static const byte _egaPaletteIndex[16]; + static const byte kEgaPaletteIndex[16]; byte _egaPalette[64][3]; }; |