diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index 1cdfc1dbf38..f11a7b23b7d 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -650,7 +650,7 @@ bool Draw::winOverlap(int16 idWin1, int16 idWin2) { (_fascinWin[idWin2].top + _fascinWin[idWin2].height <= _fascinWin[idWin1].top )) return false; - return true; + return true; } void Draw::closeWin(int16 i) { @@ -704,7 +704,7 @@ void Draw::restoreWin(int16 i) { void Draw::saveWin(int16 id) { warning("saveWin"); - _vm->_video->drawSprite(*_backSurface, *_fascinWin[id].savedSurface, + _vm->_video->drawSprite(*_backSurface, *_fascinWin[id].savedSurface, _fascinWin[id].left, _fascinWin[id].top, _fascinWin[id].left + _fascinWin[id].width - 1, _fascinWin[id].top + _fascinWin[id].height - 1, @@ -743,7 +743,7 @@ void Draw::winTrace(int16 left, int16 top, int16 width, int16 height) { // TODO: Implement proper behavior for the trace of the Window. In short, // - drawline currently use the wrong surface, to be fixed // - dirtiedRect should be put after the 4 drawlines when the surface is fixed <- Not in 256 col version - // - drawline should be replaced by a drawline with palette inversion + // - drawline should be replaced by a drawline with palette inversion // - Shift skipped as always set to zero (?) int16 right, bottom; @@ -818,7 +818,7 @@ void Draw::handleWinBorder(int16 id) { _vm->_util->setMousePos(_vm->_global->_inter_mouseX, _vm->_global->_inter_mouseY); } - winTrace(_cursorX,_cursorY, _fascinWin[id].width, _fascinWin[id].height); + winTrace(_cursorX, _cursorY, _fascinWin[id].width, _fascinWin[id].height); winTrace(_vm->_global->_inter_mouseX, _vm->_global->_inter_mouseY, _fascinWin[id].width, _fascinWin[id].height); _cursorX = _vm->_global->_inter_mouseX; _cursorY = _vm->_global->_inter_mouseY; @@ -837,7 +837,7 @@ int16 Draw::handleCurWin() { if ((_vm->_game->_mouseButtons != 1) || ((_vm->_draw->_renderFlags & 128) == 0)) return 0; - for (int i = 0; i < 10; i++) + for (int i = 0; i < 10; i++) if (_fascinWin[i].id != -1) { if ((_vm->_global->_inter_mouseX >= _fascinWin[i].left) && (_vm->_global->_inter_mouseX < _fascinWin[i].left + _fascinWin[i].width) && @@ -916,12 +916,12 @@ void Draw::winDraw(int16 fct) { int16 width; int16 height; - warning("winDraw %d", fct); - bool found = false; - int len; - Resource *resource; - int table[10]; - SurfaceDescPtr tempSrf; + warning("winDraw %d", fct); + bool found = false; + int len; + Resource *resource; + int table[10]; + SurfaceDescPtr tempSrf; if (_destSurface == 21) { @@ -1298,7 +1298,7 @@ int16 Draw::isOverWin(int16 &dx, int16 &dy) { if ((_vm->_draw->_renderFlags & 128) == 0) return -1; - for (int i = 0; i < 10; i++) + for (int i = 0; i < 10; i++) if (_fascinWin[i].id != -1) { if ((_vm->_global->_inter_mouseX >= _fascinWin[i].left) && (_vm->_global->_inter_mouseX < _fascinWin[i].left + _fascinWin[i].width) && @@ -1309,15 +1309,15 @@ int16 Draw::isOverWin(int16 &dx, int16 &dy) { dx = _fascinWin[i].left; dy = _fascinWin[i].top; return(i); - } else + } else if (_fascinWin[i].id > bestMatch) bestMatch = _fascinWin[i].id; } } - if (bestMatch != -1) + if (bestMatch != -1) return(0); - else + else return(-1); } int32 Draw::getSpriteRectSize(int16 index) { diff --git a/engines/gob/draw.h b/engines/gob/draw.h index 467917aa135..303c1b818c9 100644 --- a/engines/gob/draw.h +++ b/engines/gob/draw.h @@ -200,7 +200,7 @@ public: void handleWinBorder(int16 id); void winDraw(int16 fct); void winTrace(int16 left, int16 top, int16 width, int16 height); - int16 isOverWin(int16 &dx, int16 &dy); + int16 isOverWin(int16 &dx, int16 &dy); int32 getSpriteRectSize(int16 index); void forceBlit(bool backwards = false); diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 5d2598a2fde..b600b5b416f 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -76,7 +76,7 @@ class PauseDialog : public GUI::Dialog { public: PauseDialog(); - virtual void reflowLayout(); + virtual void reflowLayout(); virtual void handleKeyDown(Common::KeyState state); private: diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index 75cad9c143e..639a810ea84 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -558,7 +558,7 @@ uint16 Hotspots::checkMouse(Type type, uint16 &id, uint16 &index) const { if (_vm->getGameType() == kGameTypeFascination) winId = _vm->_draw->isOverWin(dx, dy); - warning("checkmouse %d - %d %d",winId, dx, dy); + warning("checkmouse %d - %d %d", winId, dx, dy); if (winId < 0) { winId = 0; diff --git a/engines/gob/inter_fascin.cpp b/engines/gob/inter_fascin.cpp index 126b2b1c7ed..43192308937 100644 --- a/engines/gob/inter_fascin.cpp +++ b/engines/gob/inter_fascin.cpp @@ -223,7 +223,7 @@ void Inter_Fascination::oFascin_activeWin() { } void Inter_Fascination::oFascin_openWin() { - int16 retVal,id; + int16 retVal, id; _vm->_game->_script->evalExpr(&id); retVal = _vm->_game->_script->readVarIndex(); WRITE_VAR((retVal / 4), (int32) _vm->_draw->openWin(id)); diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 81acf6f0558..3dd677ad478 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -721,7 +721,7 @@ bool Inter_v1::o1_loadCursor(OpFuncParams ¶ms) { return false; } -bool Inter_v1::o1_switch (OpFuncParams ¶ms) { +bool Inter_v1::o1_switch(OpFuncParams ¶ms) { uint32 offset; checkSwitchTable(offset); diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp index 0138a9dda81..45e6e0e5fa8 100644 --- a/engines/gob/sound/adlib.cpp +++ b/engines/gob/sound/adlib.cpp @@ -614,7 +614,7 @@ void MDYPlayer::interpret() { } do { instr = *_playPos; - debugC(6, kDebugSound,"MDYPlayer::interpret instr 0x%X", instr); + debugC(6, kDebugSound, "MDYPlayer::interpret instr 0x%X", instr); switch (instr) { case 0xF8: _wait = *(_playPos++); @@ -627,7 +627,7 @@ void MDYPlayer::interpret() { _playPos++; ctrlByte1 = *(_playPos++); ctrlByte2 = *(_playPos++); - debugC(6, kDebugSound,"MDYPlayer::interpret ctrlBytes 0x%X 0x%X", ctrlByte1, ctrlByte2); + debugC(6, kDebugSound, "MDYPlayer::interpret ctrlBytes 0x%X 0x%X", ctrlByte1, ctrlByte2); if (ctrlByte1 != 0x7F || ctrlByte2 != 0) { _playPos -= 2; while (*(_playPos++) != 0xF7) diff --git a/engines/gob/variables.h b/engines/gob/variables.h index d11b91ea16c..c3724bc1185 100644 --- a/engines/gob/variables.h +++ b/engines/gob/variables.h @@ -95,7 +95,7 @@ private: uint32 _size; byte *_vars; - void clear(); + void clear(); }; class VariablesLE : public Variables { diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp index ea84733b157..5684a1f4432 100644 --- a/engines/gob/video.cpp +++ b/engines/gob/video.cpp @@ -621,7 +621,7 @@ void Video::initOSD() { 171, 0, 0, 0 }; - g_system->setPalette(palOSD, 0, 5); + g_system->setPalette(palOSD, 0, 5); } void Video::drawOSDText(const char *text) {