diff options
| author | Max Horn | 2009-09-08 22:03:07 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-08 22:03:07 +0000 |
| commit | 37e51f1575992b82a3c73536eb4bba7f9e96ed53 (patch) | |
| tree | 0f7903a56e22ad14c6304135edc09bfb90a7269e | |
| parent | f1683ae5fef8358b374c1bfb316b25548538f8e0 (diff) | |
| download | scummvm-rg350-37e51f1575992b82a3c73536eb4bba7f9e96ed53.tar.gz scummvm-rg350-37e51f1575992b82a3c73536eb4bba7f9e96ed53.tar.bz2 scummvm-rg350-37e51f1575992b82a3c73536eb4bba7f9e96ed53.zip | |
Fixed some (pedantic) warnings
svn-id: r44015
| -rw-r--r-- | engines/gob/hotspots.cpp | 3 | ||||
| -rw-r--r-- | engines/gob/sound/adlib.cpp | 3 | ||||
| -rw-r--r-- | engines/groovie/cursor.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 2 | ||||
| -rw-r--r-- | graphics/scaler/thumbnail_intern.cpp | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index e65ad13088..36e8244d3f 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -986,7 +986,8 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig ((_vm->_global->_useMouse != 0) || (_vm->_game->_forceHandleMouse != 0))) handleMouse = true; - while (_vm->_global->_pressedKeys[1] != 0); + while (_vm->_global->_pressedKeys[1] != 0) + ; continue; default: diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp index 7ab8e1f8dd..170ed5ccf4 100644 --- a/engines/gob/sound/adlib.cpp +++ b/engines/gob/sound/adlib.cpp @@ -624,7 +624,8 @@ void MDYPlayer::interpret() { ctrlByte2 = *(_playPos++); if (ctrlByte1 != 0x7F || ctrlByte2 != 0) { _playPos -= 2; - while (*(_playPos++) != 0xF7); + while (*(_playPos++) != 0xF7) + ; } else { tempoMult = *(_playPos++); tempoFrac = *(_playPos++); diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp index 6a91600dbb..65804a319c 100644 --- a/engines/groovie/cursor.cpp +++ b/engines/groovie/cursor.cpp @@ -297,7 +297,7 @@ void Cursor_v2::decodeFrame(byte *pal, byte *data, byte *dest) { byte ctrA = 0, ctrB = 0; - byte alpha, palIdx; + byte alpha = 0, palIdx = 0; byte r, g, b; diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 87906cd7b3..6efe4e07da 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -203,7 +203,7 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) { s.skip(4); // base_value while (true) { - uint32 key; + uint32 key = 0; s.syncAsSint32LE(key); if (key == INTMAPPER_MAGIC_KEY) break; diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp index 5e0aa519e1..9b6d7d1593 100644 --- a/graphics/scaler/thumbnail_intern.cpp +++ b/graphics/scaler/thumbnail_intern.cpp @@ -111,7 +111,7 @@ static bool grabScreen565(Graphics::Surface *surf) { for (uint y = 0; y < screen->h; ++y) { for (uint x = 0; x < screen->w; ++x) { - byte r, g, b; + byte r = 0, g = 0, b = 0; if (screenFormat.bytesPerPixel == 1) { r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4]; |