[Scummvm-cvs-logs] SF.net SVN: scummvm:[55818] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Feb 8 00:01:07 CET 2011
Revision: 55818
http://scummvm.svn.sourceforge.net/scummvm/?rev=55818&view=rev
Author: fingolfin
Date: 2011-02-07 23:01:06 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
ALL: Fix whitespaces / indention
Modified Paths:
--------------
scummvm/trunk/engines/agi/sprite.cpp
scummvm/trunk/engines/agi/text.cpp
scummvm/trunk/engines/agos/draw.cpp
scummvm/trunk/engines/agos/gfx.cpp
scummvm/trunk/engines/agos/items.cpp
scummvm/trunk/engines/agos/res.cpp
scummvm/trunk/engines/agos/vga_e2.cpp
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/draci/game.cpp
scummvm/trunk/engines/gob/draw_playtoons.cpp
scummvm/trunk/engines/gob/global.cpp
scummvm/trunk/engines/gob/sound/adlib.cpp
scummvm/trunk/engines/hugo/hugo.cpp
scummvm/trunk/engines/kyra/animator_tim.cpp
scummvm/trunk/engines/kyra/gui.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/script_tim.cpp
scummvm/trunk/engines/lastexpress/game/sound.h
scummvm/trunk/engines/lure/events.cpp
scummvm/trunk/engines/lure/game.cpp
scummvm/trunk/engines/lure/lure.cpp
scummvm/trunk/engines/parallaction/gui_br.cpp
scummvm/trunk/engines/saga/actor_path.cpp
scummvm/trunk/engines/saga/actor_walk.cpp
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/puzzle.cpp
scummvm/trunk/engines/sci/graphics/palette.cpp
scummvm/trunk/engines/sci/sound/drivers/midi.cpp
scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
scummvm/trunk/engines/scumm/debugger.cpp
scummvm/trunk/engines/scumm/gfx.cpp
scummvm/trunk/engines/scumm/he/resource_he.cpp
scummvm/trunk/engines/scumm/he/wiz_he.cpp
scummvm/trunk/engines/scumm/script_v4.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/mouse.cpp
scummvm/trunk/engines/sword1/music.cpp
scummvm/trunk/engines/sword1/router.cpp
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword2/function.cpp
scummvm/trunk/engines/teenagent/teenagent.cpp
scummvm/trunk/engines/tinsel/events.h
scummvm/trunk/engines/tinsel/palette.cpp
scummvm/trunk/engines/tinsel/sched.cpp
scummvm/trunk/engines/toon/movie.h
scummvm/trunk/engines/toon/toon.h
scummvm/trunk/gui/widget.cpp
Modified: scummvm/trunk/engines/agi/sprite.cpp
===================================================================
--- scummvm/trunk/engines/agi/sprite.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agi/sprite.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -103,7 +103,7 @@
uint8 *p1;
// Yes, get effective priority going down
for (p1 = p; p1 < end && (epr = *p1 & 0xf0) < 0x30; p1 += width)
- ;
+ ;
if (p1 >= end)
epr = 0x40;
} else {
Modified: scummvm/trunk/engines/agi/text.cpp
===================================================================
--- scummvm/trunk/engines/agi/text.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agi/text.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -560,7 +560,7 @@
// remove all leading 0
// don't remove the 3rd zero if 000
for (i = 0; z[i] == '0' && i < 14; i++)
- ;
+ ;
} else {
i = 15 - i;
}
Modified: scummvm/trunk/engines/agos/draw.cpp
===================================================================
--- scummvm/trunk/engines/agos/draw.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agos/draw.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -879,7 +879,7 @@
src = _displayPalette;
dst = _currentPalette;
- for (p = _fastFadeInFlag; p !=0 ; p -= 3) {
+ for (p = _fastFadeInFlag; p !=0; p -= 3) {
if (src[0] >= c)
dst[0] += 4;
if (src[1] >= c)
Modified: scummvm/trunk/engines/agos/gfx.cpp
===================================================================
--- scummvm/trunk/engines/agos/gfx.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agos/gfx.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -778,7 +778,7 @@
}
void AGOSEngine::drawVertImageUncompressed(VC10_state *state) {
- assert ((state->flags & kDFCompressed) == 0) ;
+ assert((state->flags & kDFCompressed) == 0);
const byte *src;
byte *dst;
@@ -804,7 +804,7 @@
}
void AGOSEngine::drawVertImageCompressed(VC10_state *state) {
- assert (state->flags & kDFCompressed) ;
+ assert(state->flags & kDFCompressed);
uint w, h;
state->x_skip *= 4; /* reached */
Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agos/items.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -381,7 +381,7 @@
if (a == -1 && n == item->noun)
return 1;
if (a == item->adjective && n == item->noun)
- return 1 ;
+ return 1;
return 0;
}
Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agos/res.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -716,7 +716,7 @@
assert(outIndex > max - 1);
byte *pDest = dataOut + outIndex;
- for (int i = 0; (i <= max) && (outIndex > 0) ; ++i) {
+ for (int i = 0; (i <= max) && (outIndex > 0); ++i) {
pDest = dataOut + --outIndex;
*pDest = pDest[destVal];
}
Modified: scummvm/trunk/engines/agos/vga_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_e2.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/agos/vga_e2.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -360,7 +360,7 @@
for (c = 64; c != 0; c --) {
srcPal = _curVgaFile2 + 32;
dstPal = _currentPalette;
- for (p = 768; p !=0 ; p -= 3) {
+ for (p = 768; p !=0; p -= 3) {
uint8 r = srcPal[0] * 4;
if (dstPal[0] != r)
dstPal[0] += 4;
Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/cine/various.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -1323,7 +1323,8 @@
Common::List<SeqListElement>::iterator it;
SeqListElement tmp;
- for (it = g_cine->_seqList.begin(); it != g_cine->_seqList.end() && it->varE < param7; ++it) ;
+ for (it = g_cine->_seqList.begin(); it != g_cine->_seqList.end() && it->varE < param7; ++it)
+ ;
tmp.objIdx = objIdx;
tmp.var4 = param1;
Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/draci/game.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -577,8 +577,9 @@
case kStatusDialogue:
handleDialogueLoop();
break;
- case kStatusGate: ;
+ case kStatusGate:
// cannot happen when isCursonOn; added for completeness
+ break;
}
}
Modified: scummvm/trunk/engines/gob/draw_playtoons.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_playtoons.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/gob/draw_playtoons.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -219,8 +219,8 @@
break;
default:
warning("oPlaytoons_spriteOperation: operation DRAW_DRAWLINE, draw %d lines", (_pattern & 0xFF) * (_pattern & 0xFF));
- for (int16 i = 0; i <= _pattern ; i++)
- for (int16 j = 0; j <= _pattern ; j++)
+ for (int16 i = 0; i <= _pattern; i++)
+ for (int16 j = 0; j <= _pattern; j++)
_spritesArray[_destSurface]->drawLine(
_destSpriteX - (_pattern / 2) + i,
_destSpriteY - (_pattern / 2) + j,
Modified: scummvm/trunk/engines/gob/global.cpp
===================================================================
--- scummvm/trunk/engines/gob/global.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/gob/global.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -88,7 +88,7 @@
_unusedPalette1[16] = (int16) 0xAAAA;
_unusedPalette1[17] = (int16) 0xFFFF;
- for (int i = 0; i < 16 ;i++)
+ for (int i = 0; i < 16; i++)
_unusedPalette2[i] = i;
_vgaPalette[ 0].red = 0x00; _vgaPalette[ 0].green = 0x00; _vgaPalette[ 0].blue = 0x00;
Modified: scummvm/trunk/engines/gob/sound/adlib.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/gob/sound/adlib.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -736,7 +736,7 @@
_tbrStart = READ_LE_UINT16(timbrePtr);
timbrePtr += 2;
- for (int i = 0; i < _tbrCount ; i++)
+ for (int i = 0; i < _tbrCount; i++)
setVoice(i, i, true);
}
Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/hugo/hugo.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -903,7 +903,7 @@
debugC(3, kDebugEngine, "deltaX(%d, %d, %d, %d)", x1, x2, vx, y);
if (vx == 0)
- return 0 ; // Object stationary
+ return 0; // Object stationary
y *= kCompLineSize; // Offset into boundary file
if (vx > 0) {
Modified: scummvm/trunk/engines/kyra/animator_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_tim.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/kyra/animator_tim.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -208,7 +208,7 @@
Animation *anim = &_animations[animIndex];
int step = (lastFrame >= firstFrame) ? 1 : -1;
- for (int i = firstFrame; i != (lastFrame + step) ; i += step) {
+ for (int i = firstFrame; i != (lastFrame + step); i += step) {
uint32 next = _system->getMillis() + delay * _vm->_tickLength;
if (anim->wsaCopyParams & 0x4000) {
_screen->copyRegion(112, 0, 112, 0, 176, 120, 6, 2);
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/kyra/gui.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -490,7 +490,7 @@
_nextUpdate = now + _anim.delay * _vm->tickLength();
_anim.anim->displayFrame(_animIntern.curFrame, 0, 0, 0, 0, 0, 0);
- _animIntern.curFrame += _animIntern.direction ;
+ _animIntern.curFrame += _animIntern.direction;
if (_animIntern.curFrame < _anim.startFrame) {
_animIntern.curFrame = _anim.startFrame;
_animIntern.direction = 1;
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -1315,7 +1315,7 @@
Common::strlcpy(nBuf, file, sizeof(nBuf));
buffer = _res->fileData(appendLanguage(nBuf, _lang, sizeof(nBuf)), &size);
- return buffer ? size : 0 ;
+ return buffer ? size : 0;
}
uint8 *KyraEngine_MR::getTableEntry(uint8 *buffer, int id) {
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/kyra/lol.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -3687,7 +3687,7 @@
if ((flags & 0x3f) == 2 || skill)
return;
- for (int i = 0; i < 3 ; i++) {
+ for (int i = 0; i < 3; i++) {
itm = _characters[attacker].items[i];
if (!itm)
continue;
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -1400,7 +1400,7 @@
int m = 0;
int c = 0;
- for (int i = 0; i < n ; i++) {
+ for (int i = 0; i < n; i++) {
int v = _characters[i].skillModifiers[skill] + _characters[i].skillLevels[skill] + 25;
if (v > m) {
m = v;
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -906,7 +906,7 @@
#undef COMMAND_UNIMPL
#undef COMMAND
- _commands = commandProcs ;
+ _commands = commandProcs;
_commandsSize = ARRAYSIZE(commandProcs);
_screen = engine->_screen;
Modified: scummvm/trunk/engines/lastexpress/game/sound.h
===================================================================
--- scummvm/trunk/engines/lastexpress/game/sound.h 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/lastexpress/game/sound.h 2011-02-07 23:01:06 UTC (rev 55818)
@@ -360,7 +360,7 @@
void loadSoundData(SoundEntry *entry, Common::String name);
void updateEntry(SoundEntry *entry, uint value) const;
- void updateEntryState(SoundEntry *entry) const ;
+ void updateEntryState(SoundEntry *entry) const;
void resetEntry(SoundEntry *entry) const;
void removeEntry(SoundEntry *entry);
Modified: scummvm/trunk/engines/lure/events.cpp
===================================================================
--- scummvm/trunk/engines/lure/events.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/lure/events.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -141,7 +141,8 @@
LureEngine &engine = LureEngine::getReference();
do {
- while (e.pollEvent() && !engine.shouldQuit()) ;
+ while (e.pollEvent() && !engine.shouldQuit())
+ ;
g_system->delayMillis(20);
} while (!engine.shouldQuit() && (lButton() || rButton() || mButton()));
}
Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/lure/game.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -228,7 +228,8 @@
case Common::KEYCODE_KP_MINUS:
if (_debugFlag) {
if (roomNum == 1) roomNum = 55;
- while (res.getRoom(--roomNum) == NULL) ;
+ while (res.getRoom(--roomNum) == NULL)
+ ;
room.setRoomNumber(roomNum);
}
break;
Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/lure/lure.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -233,7 +233,8 @@
}
// Read in and discard the savegame caption
- while (f->readByte() != 0) ;
+ while (f->readByte() != 0)
+ ;
// Load in the data
Resources::getReference().loadFromStream(f);
Modified: scummvm/trunk/engines/parallaction/gui_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_br.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/parallaction/gui_br.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -250,7 +250,8 @@
bool complete[3];
_vm->_saveLoad->getGamePartProgress(complete, 3);
- for (i = 0; i < 3 && complete[i]; i++, _availItems++) ;
+ for (i = 0; i < 3 && complete[i]; i++, _availItems++)
+ ;
if (_vm->getPlatform() == Common::kPlatformAmiga) {
_menuStrings = _menuStringsAmiga;
Modified: scummvm/trunk/engines/saga/actor_path.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor_path.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/saga/actor_path.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -464,7 +464,7 @@
// directly reached from the first node. If we find any, skip directly
// from the first node to that node (by marking all nodes in between as
// empty).
- for (i = _pathNodeList.size() - 2; i > 1 ; i--) {
+ for (i = _pathNodeList.size() - 2; i > 1; i--) {
if (_pathNodeList[i].point.x == PATH_NODE_EMPTY) {
continue;
}
Modified: scummvm/trunk/engines/saga/actor_walk.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor_walk.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/saga/actor_walk.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -992,7 +992,7 @@
} else if (pointFrom.y > anotherActorScreenPosition.y) {
testBox.bottom = pointFrom.y - 1;
} else {
- testBox.top = pointFrom.y + 1 ;
+ testBox.top = pointFrom.y + 1;
}
}
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/saga/interface.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -2705,7 +2705,7 @@
_vm->_gfx->getCurrentPal(_mapSavedPal);
- for (i = 0; i < 6 ; i++) {
+ for (i = 0; i < 6; i++) {
_vm->_gfx->palToBlack(_mapSavedPal, 0.2 * i);
_vm->_render->drawScene();
_vm->_system->delayMillis(5);
@@ -2728,7 +2728,7 @@
_vm->_gfx->drawRegion(rect, image.getBuffer());
// Evil Evil
- for (i = 0; i < 6 ; i++) {
+ for (i = 0; i < 6; i++) {
_vm->_gfx->blackToPal(cPal, 0.2 * i);
_vm->_render->drawScene();
_vm->_system->delayMillis(5);
@@ -2746,7 +2746,7 @@
_vm->_gfx->getCurrentPal(pal);
- for (i = 0; i < 6 ; i++) {
+ for (i = 0; i < 6; i++) {
_vm->_gfx->palToBlack(pal, 0.2 * i);
_vm->_render->drawScene();
_vm->_system->delayMillis(5);
@@ -2758,7 +2758,7 @@
_vm->_gfx->showCursor(true);
_vm->_render->drawScene();
- for (i = 0; i < 6 ; i++) {
+ for (i = 0; i < 6; i++) {
_vm->_gfx->blackToPal(_mapSavedPal, 0.2 * i);
_vm->_render->drawScene();
_vm->_system->delayMillis(5);
Modified: scummvm/trunk/engines/saga/puzzle.cpp
===================================================================
--- scummvm/trunk/engines/saga/puzzle.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/saga/puzzle.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -191,7 +191,7 @@
SpriteList *spriteList;
_vm->_actor->getSpriteParams(puzzle, frameNumber, spriteList);
- for (int j = PUZZLE_PIECES - 1 ; j >= 0; j--) {
+ for (int j = PUZZLE_PIECES - 1; j >= 0; j--) {
int num = _piecePriority[j];
if (_puzzlePiece != num) {
@@ -350,9 +350,9 @@
spI = &((*spriteList)[_puzzlePiece]);
if (newx + spI->width > boxw)
- newx = boxw - spI->width ;
+ newx = boxw - spI->width;
if (newy + spI->height > boxh)
- newy = boxh - spI->height ;
+ newy = boxh - spI->height;
int x1 = ((newx - PUZZLE_X_OFFSET) & ~7) + PUZZLE_X_OFFSET;
int y1 = ((newy - PUZZLE_Y_OFFSET) & ~7) + PUZZLE_Y_OFFSET;
Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -299,7 +299,7 @@
bool paletteChanged = false;
// colors 0 (black) and 255 (white) are not affected by merging
- for (i = 1 ; i < 255; i++) {
+ for (i = 1; i < 255; i++) {
if (!newPalette->colors[i].used)// color is not used - so skip it
continue;
// forced palette merging or dest color is not used yet
Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -785,7 +785,7 @@
if (size > pos && ((0x100 * *(data + pos) + *(data + pos + 1)) == 0xdcba)) {
debugC(kDebugLevelSound, "\n[MT32-to-GM] Mapping percussion..");
- for (i = 0; i < 64 ; i++) {
+ for (i = 0; i < 64; i++) {
number = *(data + pos + 4 * i + 2);
byte ins = i + 24;
Modified: scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -52,7 +52,7 @@
static inline int get_freq(int note) {
int halftone_delta = note - BASE_NOTE;
int oct_diff = ((halftone_delta + BASE_OCTAVE * 12) / 12) - BASE_OCTAVE;
- int halftone_index = (halftone_delta + (12 * 100)) % 12 ;
+ int halftone_index = (halftone_delta + (12 * 100)) % 12;
int freq = (!note) ? 0 : freq_table[halftone_index] / (1 << (-oct_diff));
return freq;
Modified: scummvm/trunk/engines/scumm/debugger.cpp
===================================================================
--- scummvm/trunk/engines/scumm/debugger.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/scumm/debugger.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -425,7 +425,7 @@
DebugPrintf("|num | x | y |width|height|state|fl| cls |\n");
DebugPrintf("+----+----+----+-----+------+-----+--+---------+\n");
- for (i = 1; i < _vm->_numLocalObjects ; i++) {
+ for (i = 1; i < _vm->_numLocalObjects; i++) {
o = &(_vm->_objs[i]);
if (o->obj_nr == 0)
continue;
Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/scumm/gfx.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -3122,7 +3122,7 @@
// Decode the graphics strips, and memorize the run/color values
// as well as the byte offset.
- for (x = 0 ; x < width; x++) {
+ for (x = 0; x < width; x++) {
if ((x % 8) == 0) {
assert(x / 8 < 160);
Modified: scummvm/trunk/engines/scumm/he/resource_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/scumm/he/resource_he.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -241,7 +241,7 @@
if (type == NULL)
return NULL;
- for (c = 0 ; c < (int)RES_TYPE_COUNT ; c++) {
+ for (c = 0; c < (int)RES_TYPE_COUNT; c++) {
if (res_types[c] != NULL && !scumm_stricmp(type, res_types[c]))
return res_type_ids[c];
}
@@ -355,7 +355,7 @@
/* calculate total size of output file */
RETURN_IF_BAD_POINTER(NULL, icondir->count);
skipped = 0;
- for (c = 0 ; c < FROM_LE_16(icondir->count) ; c++) {
+ for (c = 0; c < FROM_LE_16(icondir->count); c++) {
int level;
int iconsize;
char name[14];
@@ -411,7 +411,7 @@
/* transfer each cursor/icon: Win32CursorIconDirEntry and data */
skipped = 0;
- for (c = 0 ; c < FROM_LE_16(icondir->count) ; c++) {
+ for (c = 0; c < FROM_LE_16(icondir->count); c++) {
int level;
char name[14];
WinResource *fwr;
@@ -585,7 +585,7 @@
RETURN_IF_BAD_OFFSET(false, &mem[1], sizeof(uint16) * len);
len = MIN(FROM_LE_16(mem[0]), (uint16)WINRES_ID_MAXLEN);
- for (c = 0 ; c < len ; c++)
+ for (c = 0; c < len; c++)
wr->id[c] = FROM_LE_16(mem[c+1]) & 0x00FF;
wr->id[len] = '\0';
wr->numeric_id = false;
@@ -629,7 +629,7 @@
wr = (WinResource *)malloc(sizeof(WinResource) * rescnt);
/* fill in the WinResource's */
- for (c = 0 ; c < rescnt ; c++) {
+ for (c = 0; c < rescnt; c++) {
RETURN_IF_BAD_POINTER(NULL, dirent[c]);
wr[c].this_ = pe_res;
wr[c].level = level;
@@ -708,7 +708,7 @@
/* we don't need to do OFFSET checking for the sections.
* calc_vma_size has already done that */
- for (d = pe_header->file_header.number_of_sections - 1; d >= 0 ; d--) {
+ for (d = pe_header->file_header.number_of_sections - 1; d >= 0; d--) {
Win32ImageSectionHeader *pe_sec = PE_SECTIONS(fi->memory) + d;
if (pe_sec->characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)
@@ -765,7 +765,7 @@
seg = PE_SECTIONS(fi->memory);
RETURN_IF_BAD_POINTER(-1, *seg);
- for (c = 0 ; c < segcount ; c++) {
+ for (c = 0; c < segcount; c++) {
RETURN_IF_BAD_POINTER(0, *seg);
fix_win32_image_section_header(seg);
@@ -786,7 +786,7 @@
if (wr == NULL)
return NULL;
- for (c = 0 ; c < rescnt ; c++) {
+ for (c = 0; c < rescnt; c++) {
if (compare_resource_id(&wr[c], id)) {
/* duplicate WinResource and return it */
return_wr = (WinResource *)malloc(sizeof(WinResource));
Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -2342,7 +2342,7 @@
const uint8 *index = params->remapIndex;
uint8 *iwiz = _vm->getResourceAddress(rtImage, params->img.resNum);
assert(iwiz);
- uint8 *rmap = _vm->findWrappedBlock(MKID_BE('RMAP'), iwiz, st, 0) ;
+ uint8 *rmap = _vm->findWrappedBlock(MKID_BE('RMAP'), iwiz, st, 0);
assert(rmap);
WRITE_BE_UINT32(rmap, 0x01234567);
while (num--) {
Modified: scummvm/trunk/engines/scumm/script_v4.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v4.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/scumm/script_v4.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -304,7 +304,7 @@
// merge episode and series IQ strings and calculate series IQ
seriesIQ = 0;
// iterate over puzzles
- for (int i = 0; i < NUM_PUZZLES ; ++i) {
+ for (int i = 0; i < NUM_PUZZLES; ++i) {
byte puzzleIQ = seriesIQString[i];
// if puzzle is solved copy points to episode string
if (puzzleIQ > 0)
Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword1/control.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -122,7 +122,7 @@
_width = (_width > SCREEN_WIDTH) ? SCREEN_WIDTH : _width;
_height = _resMan->getUint16(tmp->height);
if ((x == 0) && (y == 0)) { // center the frame (used for panels);
- _x = (((640 - _width) / 2) < 0)? 0 : ((640 - _width) / 2) ;
+ _x = (((640 - _width) / 2) < 0)? 0 : ((640 - _width) / 2);
_y = (((480 - _height) / 2) < 0)? 0 : ((480 - _height) / 2);
}
_dstBuf = screenBuf + _y * SCREEN_WIDTH + _x;
Modified: scummvm/trunk/engines/sword1/mouse.cpp
===================================================================
--- scummvm/trunk/engines/sword1/mouse.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword1/mouse.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -313,7 +313,7 @@
void Mouse::fnNoHuman() {
if (Logic::_scriptVars[MOUSE_STATUS] & 2) // locked, can't do anything
- return ;
+ return;
Logic::_scriptVars[MOUSE_STATUS] = 0; // off & unlocked
setLuggage(0, 0);
setPointer(0, 0);
@@ -321,7 +321,7 @@
void Mouse::fnAddHuman() {
if (Logic::_scriptVars[MOUSE_STATUS] & 2) // locked, can't do anything
- return ;
+ return;
Logic::_scriptVars[MOUSE_STATUS] = 1;
Logic::_scriptVars[SPECIAL_ITEM] = 0;
_getOff = SCR_std_off;
Modified: scummvm/trunk/engines/sword1/music.cpp
===================================================================
--- scummvm/trunk/engines/sword1/music.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword1/music.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -306,7 +306,7 @@
/* The handle will load the music file now. It can take a while, so unlock
the mutex before, to have the soundthread playing normally.
As the corresponding _converter is NULL, the handle will be ignored by the playing thread */
- if (SwordEngine::isPsx()) { ;
+ if (SwordEngine::isPsx()) {
if (_handles[newStream].playPSX(tuneId, loopFlag != 0)) {
_mutex.lock();
_converter[newStream] = Audio::makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
Modified: scummvm/trunk/engines/sword1/router.cpp
===================================================================
--- scummvm/trunk/engines/sword1/router.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword1/router.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -783,7 +783,7 @@
stepCount += 1;
step += 1;
module += 1;
- } while ( module < moduleEnd) ;
+ } while ( module < moduleEnd);
stepX = _modX[_modularPath[p].dir];
stepY = _modY[_modularPath[p].dir];
errorX = _modularPath[p].x - moduleX;
@@ -1238,7 +1238,7 @@
stepCount += 1;
module += 1;
step += 1;
- } while ( module < moduleEnd) ;
+ } while ( module < moduleEnd);
errorX = _modularPath[p].x - moduleX;
errorX = errorX * _modX[_modularPath[p].dir];
errorY = _modularPath[p].y - moduleY;
@@ -1951,8 +1951,8 @@
//ResClose(megaObject->o_mega_resource); // mouse wiggle
_resMan->resClose(megaObject->o_mega_resource);
- _diagonalx = _modX[3] ;//36
- _diagonaly = _modY[3] ;//8
+ _diagonalx = _modX[3]; //36
+ _diagonaly = _modY[3]; //8
// mega data ready
Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword1/screen.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -760,7 +760,7 @@
uint8 *dest = _screenBuf + (sprY * _scrnSizeX) + sprX;
for (uint16 cnty = 0; cnty < sprHeight; cnty++) {
- for (uint16 cntx = 0; cntx < sprWidth ; cntx++)
+ for (uint16 cntx = 0; cntx < sprWidth; cntx++)
if (sprData[cntx]) {
dest[cntx * 3] = sprData[cntx]; //In these sprites we need to double vertical lines too...
dest[cntx * 3 + 1] = sprData[cntx];
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword1/sound.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -130,7 +130,7 @@
else
size /= 2;
int16 prev_be_value = (int16)SWAP_BYTES_16(*((uint16*)(data)));
- for (uint32 i = 1 ; i < size ; ++i) {
+ for (uint32 i = 1; i < size; ++i) {
le_diff_sum += fabs((double)(data[i] - data[i-1]));
int16 be_value = (int16)SWAP_BYTES_16(*((uint16*)(data + i)));
be_diff_sum += fabs((double)(be_value - prev_be_value));
@@ -209,7 +209,7 @@
if (cnt != _endOfQueue-1)
_fxQueue[cnt] = _fxQueue[_endOfQueue-1];
_endOfQueue--;
- return ;
+ return;
}
debug(8, "fnStopFx: id not found in queue");
}
Modified: scummvm/trunk/engines/sword2/function.cpp
===================================================================
--- scummvm/trunk/engines/sword2/function.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/sword2/function.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -1292,7 +1292,7 @@
obSpeech.setCommand(0);
obSpeech.setWaitState(1);
- return IR_REPEAT ;
+ return IR_REPEAT;
case INS_sort:
fnSortSprite(params); // ob_graphic
Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -277,7 +277,8 @@
case Common::EVENT_KEYDOWN:
if (event.kbd.ascii)
return 1;
- default: ;
+ default:
+ break;
}
}
return 0;
Modified: scummvm/trunk/engines/tinsel/events.h
===================================================================
--- scummvm/trunk/engines/tinsel/events.h 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/tinsel/events.h 2011-02-07 23:01:06 UTC (rev 55818)
@@ -75,7 +75,7 @@
PLR_SRIGHT = PLR_LOOK,
PLR_DRIGHT = PLR_NOEVENT,
PLR_UNKNOWN = PLR_NOEVENT
-} ;
+};
Modified: scummvm/trunk/engines/tinsel/palette.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/palette.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/tinsel/palette.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -631,7 +631,7 @@
if (startColour + length > pPalQ->numColours)
error("DimPartPalette(): colour overrun");
- for (iColour = startColour ; iColour < startColour + length; iColour++) {
+ for (iColour = startColour; iColour < startColour + length; iColour++) {
pPalQ->palRGB[iColour] = DimColour(pDimPal->palRGB[iColour], brightness);
}
Modified: scummvm/trunk/engines/tinsel/sched.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sched.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/tinsel/sched.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -288,7 +288,8 @@
PPROCESS pEnd;
// Find the last process in the list.
- for (pEnd = pCurrent; pEnd->pNext != NULL; pEnd = pEnd->pNext) ;
+ for (pEnd = pCurrent; pEnd->pNext != NULL; pEnd = pEnd->pNext)
+ ;
assert(pEnd->pNext == NULL);
Modified: scummvm/trunk/engines/toon/movie.h
===================================================================
--- scummvm/trunk/engines/toon/movie.h 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/toon/movie.h 2011-02-07 23:01:06 UTC (rev 55818)
@@ -36,7 +36,7 @@
ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType = Audio::Mixer::kSFXSoundType);
virtual ~ToonstruckSmackerDecoder() {}
void handleAudioTrack(byte track, uint32 chunkSize, uint32 unpackedSize);
- bool loadFile(const Common::String &filename, int forcedflags) ;
+ bool loadFile(const Common::String &filename, int forcedflags);
bool isLowRes() { return _lowRes; }
protected:
bool _lowRes;
Modified: scummvm/trunk/engines/toon/toon.h
===================================================================
--- scummvm/trunk/engines/toon/toon.h 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/engines/toon/toon.h 2011-02-07 23:01:06 UTC (rev 55818)
@@ -179,8 +179,8 @@
Common::String getSavegameName(int nr);
bool loadGame(int32 slot);
bool saveGame(int32 slot, Common::String saveGameDesc);
- void fadeIn(int32 numFrames) ;
- void fadeOut(int32 numFrames) ;
+ void fadeIn(int32 numFrames);
+ void fadeOut(int32 numFrames);
void initCharacter(int32 characterId, int32 animScriptId, int32 animToPlayId, int32 sceneAnimationId);
int32 handleInventoryOnFlux(int32 itemId);
int32 handleInventoryOnInventory(int32 itemDest, int32 itemSrc);
Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp 2011-02-07 22:59:00 UTC (rev 55817)
+++ scummvm/trunk/gui/widget.cpp 2011-02-07 23:01:06 UTC (rev 55818)
@@ -215,7 +215,7 @@
Common::String Widget::cleanupHotkey(const Common::String &label) {
Common::String res;
- for (uint i = 0; i < label.size() ; i++)
+ for (uint i = 0; i < label.size(); i++)
if (label[i] != '~')
res = res + label[i];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list