libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-11 03:01:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some (pedantic) warnings

Browse Source 
svn-id: r44015
This commit is contained in:
Max Horn 2009-09-08 22:03:07 +00:00
parent f1683ae5fe
commit 37e51f1575
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/gob/hotspots.cpp
View File

@ -986,7 +986,8 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
((_vm->_global->_useMouse != 0) || (_vm->_game->_forceHandleMouse != 0))) ((_vm->_global->_useMouse != 0) || (_vm->_game->_forceHandleMouse != 0)))
handleMouse = true; handleMouse = true;
while (_vm->_global->_pressedKeys[1] != 0); while (_vm->_global->_pressedKeys[1] != 0)
;
continue; continue;
default: default:

3
engines/gob/sound/adlib.cpp
View File

@ -624,7 +624,8 @@ void MDYPlayer::interpret() {
ctrlByte2 = *(_playPos++); ctrlByte2 = *(_playPos++);
if (ctrlByte1 != 0x7F || ctrlByte2 != 0) { if (ctrlByte1 != 0x7F || ctrlByte2 != 0) {
_playPos -= 2; _playPos -= 2;
while (*(_playPos++) != 0xF7); while (*(_playPos++) != 0xF7)
;
} else { } else {
tempoMult = *(_playPos++); tempoMult = *(_playPos++);
tempoFrac = *(_playPos++); tempoFrac = *(_playPos++);

2
engines/groovie/cursor.cpp
View File

@ -297,7 +297,7 @@ void Cursor_v2::decodeFrame(byte *pal, byte *data, byte *dest) {
byte ctrA = 0, ctrB = 0; byte ctrA = 0, ctrB = 0;
byte alpha, palIdx; byte alpha = 0, palIdx = 0;
byte r, g, b; byte r, g, b;

2
engines/sci/engine/savegame.cpp
View File

@ -203,7 +203,7 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
s.skip(4); // base_value s.skip(4); // base_value
while (true) { while (true) {
uint32 key; uint32 key = 0;
s.syncAsSint32LE(key); s.syncAsSint32LE(key);
if (key == INTMAPPER_MAGIC_KEY) if (key == INTMAPPER_MAGIC_KEY)
break; break;

2
graphics/scaler/thumbnail_intern.cpp
View File

@ -111,7 +111,7 @@ static bool grabScreen565(Graphics::Surface *surf) {
for (uint y = 0; y < screen->h; ++y) { for (uint y = 0; y < screen->h; ++y) {
for (uint x = 0; x < screen->w; ++x) { for (uint x = 0; x < screen->w; ++x) {
byte r, g, b; byte r = 0, g = 0, b = 0;
if (screenFormat.bytesPerPixel == 1) { if (screenFormat.bytesPerPixel == 1) {
r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4]; r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4];