[Scummvm-cvs-logs] SF.net SVN: scummvm:[53161] scummvm/trunk
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Tue Oct 12 06:19:59 CEST 2010
Revision: 53161
http://scummvm.svn.sourceforge.net/scummvm/?rev=53161&view=rev
Author: eriktorbjorn
Date: 2010-10-12 04:19:58 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
JANITORIAL: Cleanup (mostly whitespace)
Modified Paths:
--------------
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/gob/hotspots.cpp
scummvm/trunk/engines/gob/scenery.cpp
scummvm/trunk/engines/kyra/resource_intern.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/script_tim.cpp
scummvm/trunk/engines/kyra/sprites.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/engines/kyra/text_hof.cpp
scummvm/trunk/engines/parallaction/walk.cpp
scummvm/trunk/engines/queen/cutaway.cpp
scummvm/trunk/engines/queen/talk.cpp
scummvm/trunk/engines/saga/actor.h
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/isomap.cpp
scummvm/trunk/engines/saga/puzzle.cpp
scummvm/trunk/engines/saga/script.cpp
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sword1/router.cpp
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword1/text.cpp
scummvm/trunk/engines/sword2/mouse.cpp
scummvm/trunk/engines/toon/anim.cpp
scummvm/trunk/engines/toon/audio.cpp
scummvm/trunk/engines/toon/flux.cpp
scummvm/trunk/engines/toon/hotspot.cpp
scummvm/trunk/engines/toon/path.cpp
scummvm/trunk/engines/toon/picture.cpp
scummvm/trunk/engines/toon/resource.cpp
scummvm/trunk/engines/toon/toon.cpp
scummvm/trunk/graphics/VectorRendererSpec.cpp
scummvm/trunk/gui/ThemeParser.cpp
scummvm/trunk/sound/decoders/flac.cpp
scummvm/trunk/sound/softsynth/opl/mame.cpp
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/agi/detection.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -435,7 +435,8 @@
// If there's game last edit date in the *.wag file, add it to extra
if (wagGameLastEdit != NULL) {
- if (!_extra.empty() ) _extra += " ";
+ if (!_extra.empty())
+ _extra += " ";
_extra += wagGameLastEdit->getData();
debug(3, "Agi::fallbackDetector: Game's last edit date (%s) from WAG file", wagGameLastEdit->getData());
}
Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/gob/hotspots.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -1516,7 +1516,7 @@
int16 duration = _vm->_game->_script->peekByte(1);
byte leaveWindowIndex = 0;
- if ( _vm->getGameType() == kGameTypeFascination )
+ if (_vm->getGameType() == kGameTypeFascination)
leaveWindowIndex = _vm->_game->_script->peekByte(2);
byte hotspotIndex1 = _vm->_game->_script->peekByte(3);
@@ -1642,7 +1642,7 @@
int16 deltax = 0;
int16 deltay = 0;
- if ( _vm->getGameType() == kGameTypeFascination )
+ if (_vm->getGameType() == kGameTypeFascination)
cursor = curWindow(deltax, deltay);
if (cursor == 0) {
@@ -2106,7 +2106,7 @@
_vm->_draw->_spriteBottom = height;
_vm->_draw->_backColor = color;
- _vm->_draw->spriteOperation(DRAW_FILLRECT | 0x10 );
+ _vm->_draw->spriteOperation(DRAW_FILLRECT | 0x10);
}
void Hotspots::printText(uint16 x, uint16 y, const char *str, uint16 fontIndex, uint16 color) const {
Modified: scummvm/trunk/engines/gob/scenery.cpp
===================================================================
--- scummvm/trunk/engines/gob/scenery.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/gob/scenery.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -65,7 +65,7 @@
_pCaptureCounter = 0;
- for (int i = 0; i < 70; i++ ) {
+ for (int i = 0; i < 70; i++) {
_staticPictToSprite[i] = 0;
_animPictToSprite[i] = 0;
}
Modified: scummvm/trunk/engines/kyra/resource_intern.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource_intern.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/resource_intern.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -514,7 +514,7 @@
_key >>= 1;
if (!--_bitsLeft) {
if (_dataPtr < _endofBuffer)
- _key = ((*_dataPtr++) << 8 ) | (_key & 0xff);
+ _key = ((*_dataPtr++) << 8) | (_key & 0xff);
_bitsLeft = 8;
}
}
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/screen.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -787,7 +787,7 @@
}
if (y2 < 0) {
- if (y2 <= -h )
+ if (y2 <= -h)
return;
h += y2;
y1 -= y2;
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -637,7 +637,7 @@
d++;
}
- for (int ii = (i & 1) ^ 1; ii < ibw_2; ii += 2 ) {
+ for (int ii = (i & 1) ^ 1; ii < ibw_2; ii += 2) {
*d = *s;
d += 2;
s += 2;
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -259,7 +259,7 @@
if (cur.ip) {
cur.ip += cur.ip[0];
cur.lastTime = cur.nextTime;
- cur.nextTime += (cur.ip[1] ) * _vm->tickLength();
+ cur.nextTime += cur.ip[1] * _vm->tickLength();
}
}
}
Modified: scummvm/trunk/engines/kyra/sprites.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/sprites.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -71,7 +71,7 @@
if (_anims[i].script != 0) {
data = _anims[i].script;
- assert( READ_LE_UINT16(data) == 0xFF86 );
+ assert(READ_LE_UINT16(data) == 0xFF86);
data += 4;
_anims[i].disable = READ_LE_UINT16(data) != 0;
@@ -509,7 +509,7 @@
}
void Sprites::freeSceneShapes() {
- for (int i = 0; i < ARRAYSIZE(_sceneShapes); i++ ) {
+ for (int i = 0; i < ARRAYSIZE(_sceneShapes); i++) {
delete[] _sceneShapes[i];
_sceneShapes[i] = 0;
}
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -878,7 +878,7 @@
_shapes[323] = 0;
- for (shape = 1; shape < 6; shape++ )
+ for (shape = 1; shape < 6; shape++)
_shapes[323 + shape] = _screen->encodeShape((shape - 1) * 32, 0, 32, 17, 0);
for (shape = 330; shape <= 334; shape++)
Modified: scummvm/trunk/engines/kyra/text_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_hof.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/kyra/text_hof.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -544,7 +544,7 @@
}
objectChat((const char *)_unkBuf500Bytes, 0, vocHi, vocLo);
} else {
- if (activeTimSequence != nextTimSequence ) {
+ if (activeTimSequence != nextTimSequence) {
if (activeTimSequence > -1) {
deinitTalkObject(activeTimSequence);
activeTimSequence = -1;
Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/parallaction/walk.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -88,7 +88,7 @@
} while ((top > 0) && !IS_PATH_CLEAR(to.x, top));
do {
bottom++;
- } while ((bottom < maxY) && !IS_PATH_CLEAR(to.x, bottom) );
+ } while ((bottom < maxY) && !IS_PATH_CLEAR(to.x, bottom));
top = (top == 0) ? 1000 : to.y - top;
bottom = (bottom == maxY) ? 1000 : bottom - to.y;
Modified: scummvm/trunk/engines/queen/cutaway.cpp
===================================================================
--- scummvm/trunk/engines/queen/cutaway.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/queen/cutaway.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -283,7 +283,7 @@
}
BobSlot *bob =
- _vm->graphics()->bob( _vm->logic()->findBob(object.objectNumber) );
+ _vm->graphics()->bob(_vm->logic()->findBob(object.objectNumber));
if (!bob) {
warning("Failed to find bob");
@@ -667,7 +667,7 @@
// Only flip if we are not moving or it is not a person object
if (!(objAnim[i].object > 0 && objAnim[i].object < 4) ||
- !(objAnim[i].mx || objAnim[i].my) )
+ !(objAnim[i].mx || objAnim[i].my))
bob->xflip = objAnim[i].flip;
// Add frame alteration
@@ -1235,7 +1235,7 @@
}
BobSlot *bob =
- _vm->graphics()->bob( _vm->logic()->findBob(ABS(object.objectNumber)) );
+ _vm->graphics()->bob(_vm->logic()->findBob(ABS(object.objectNumber)));
_vm->graphics()->setBobText(bob, sentence, x, object.bobStartY, object.specialMove, flags);
Modified: scummvm/trunk/engines/queen/talk.cpp
===================================================================
--- scummvm/trunk/engines/queen/talk.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/queen/talk.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -551,11 +551,11 @@
return personWalking;
}
- if (0 == strcmp(person->name, "FAYE-H" ) ||
+ if (0 == strcmp(person->name, "FAYE-H") ||
0 == strcmp(person->name, "FRANK-H") ||
0 == strcmp(person->name, "AZURA-H") ||
0 == strcmp(person->name, "X3_RITA") ||
- (0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == FAYE_HEAD ) ||
+ (0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == FAYE_HEAD) ||
(0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == AZURA_HEAD) ||
(0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == FRANK_HEAD))
_talkHead = true;
Modified: scummvm/trunk/engines/saga/actor.h
===================================================================
--- scummvm/trunk/engines/saga/actor.h 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/saga/actor.h 2010-10-12 04:19:58 UTC (rev 53161)
@@ -451,8 +451,8 @@
void cmdActorWalkTo(int argc, const char **argv);
bool validActorId(uint16 id) { return (id == ID_PROTAG) || ((id >= objectIndexToId(kGameObjectActor, 0)) && (id < objectIndexToId(kGameObjectActor, _actorsCount))); }
- int actorIdToIndex(uint16 id) { return (id == ID_PROTAG ) ? 0 : objectIdToIndex(id); }
- uint16 actorIndexToId(int index) { return (index == 0 ) ? ID_PROTAG : objectIndexToId(kGameObjectActor, index); }
+ int actorIdToIndex(uint16 id) { return (id == ID_PROTAG) ? 0 : objectIdToIndex(id); }
+ uint16 actorIndexToId(int index) { return (index == 0) ? ID_PROTAG : objectIndexToId(kGameObjectActor, index); }
ActorData *getActor(uint16 actorId);
ActorData *getFirstActor() { return _actors[0]; }
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/saga/interface.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -1398,7 +1398,7 @@
char *fileName;
switch (panelButton->id) {
case kTextSave:
- if (_textInputStringLength == 0 ) {
+ if (_textInputStringLength == 0) {
break;
}
if (!_vm->isSaveListFull() && (_optionSaveFileTitleNumber == 0)) {
@@ -2166,43 +2166,43 @@
byte solidColor;
byte odl, our, idl, iur;
- switch (kind ) {
- case kSlider:
- cornerColor = 0x8b;
- frameColor = _vm->KnownColor2ColorId(kKnownColorBlack);
- fillColor = kITEColorLightBlue96;
- odl = kITEColorDarkBlue8a;
- our = kITEColorLightBlue92;
- idl = 0x89;
- iur = 0x94;
- solidColor = down ? kITEColorLightBlue94 : kITEColorLightBlue96;
- break;
- case kEdit:
- if (_vm->getGameId() == GID_ITE) {
- cornerColor = frameColor = fillColor = kITEColorLightBlue96;
- our = kITEColorDarkBlue8a;
- odl = kITEColorLightBlue94;
- solidColor = down ? kITEColorBlue : kITEColorDarkGrey0C;
- } else {
- cornerColor = frameColor = fillColor = _vm->KnownColor2ColorId(kKnownColorBlack);
- our = odl = solidColor = _vm->KnownColor2ColorId(kKnownColorBlack);
- }
- iur = 0x97;
- idl = 0x95;
- break;
- default:
- cornerColor = 0x8b;
- frameColor = _vm->KnownColor2ColorId(kKnownColorBlack);
- solidColor = fillColor = kITEColorLightBlue96;
- odl = kITEColorDarkBlue8a;
- our = kITEColorLightBlue94;
- idl = 0x97;
- iur = 0x95;
- if (down) {
- SWAP(odl, our);
- SWAP(idl, iur);
- }
- break;
+ switch (kind) {
+ case kSlider:
+ cornerColor = 0x8b;
+ frameColor = _vm->KnownColor2ColorId(kKnownColorBlack);
+ fillColor = kITEColorLightBlue96;
+ odl = kITEColorDarkBlue8a;
+ our = kITEColorLightBlue92;
+ idl = 0x89;
+ iur = 0x94;
+ solidColor = down ? kITEColorLightBlue94 : kITEColorLightBlue96;
+ break;
+ case kEdit:
+ if (_vm->getGameId() == GID_ITE) {
+ cornerColor = frameColor = fillColor = kITEColorLightBlue96;
+ our = kITEColorDarkBlue8a;
+ odl = kITEColorLightBlue94;
+ solidColor = down ? kITEColorBlue : kITEColorDarkGrey0C;
+ } else {
+ cornerColor = frameColor = fillColor = _vm->KnownColor2ColorId(kKnownColorBlack);
+ our = odl = solidColor = _vm->KnownColor2ColorId(kKnownColorBlack);
+ }
+ iur = 0x97;
+ idl = 0x95;
+ break;
+ default:
+ cornerColor = 0x8b;
+ frameColor = _vm->KnownColor2ColorId(kKnownColorBlack);
+ solidColor = fillColor = kITEColorLightBlue96;
+ odl = kITEColorDarkBlue8a;
+ our = kITEColorLightBlue94;
+ idl = 0x97;
+ iur = 0x95;
+ if (down) {
+ SWAP(odl, our);
+ SWAP(idl, iur);
+ }
+ break;
}
int x = rect.left;
Modified: scummvm/trunk/engines/saga/isomap.cpp
===================================================================
--- scummvm/trunk/engines/saga/isomap.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/saga/isomap.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -303,8 +303,8 @@
_viewScroll.x = maxScrollPos.x;
}
} else {
- _viewScroll.y = smoothSlide( _viewScroll.y, minScrollPos.y, maxScrollPos.y );
- _viewScroll.x = smoothSlide( _viewScroll.x, minScrollPos.x, maxScrollPos.x );
+ _viewScroll.y = smoothSlide(_viewScroll.y, minScrollPos.y, maxScrollPos.y);
+ _viewScroll.x = smoothSlide(_viewScroll.x, minScrollPos.x, maxScrollPos.x);
}
if (_vm->_scene->currentSceneResourceId() == ITE_SCENE_OVERMAP) {
@@ -429,7 +429,7 @@
workAreaWidth = _vm->getDisplayInfo().width + 128;
workAreaHeight = _vm->_scene->getHeight() + 128 + 80;
- for (u1 = u0, v1 = v0; metaTileY.y < workAreaHeight; u1--, v1-- ) {
+ for (u1 = u0, v1 = v0; metaTileY.y < workAreaHeight; u1--, v1--) {
metaTileX = metaTileY;
for (u2 = u1, v2 = v1; metaTileX.x < workAreaWidth; u2++, v2--, metaTileX.x += 256) {
@@ -611,7 +611,7 @@
for (u = SAGA_PLATFORM_W - 1,
copyLocation.u() = location.u() - ((SAGA_PLATFORM_W - 1) << 4);
u >= 0 && s.x + 32 > _tileClip.left && s.y - SAGA_MAX_TILE_H < _tileClip.bottom;
- u--, copyLocation.u() += 16, s.x -= 16, s.y += 8 ) {
+ u--, copyLocation.u() += 16, s.x -= 16, s.y += 8) {
if (s.x < _tileClip.right && s.y > _tileClip.top) {
tileIndex = tilePlatform->tiles[u][v];
@@ -663,7 +663,7 @@
for (u = SAGA_PLATFORM_W - 1;
u >= 0 && s.x + 32 > _tileClip.left && s.y - SAGA_MAX_TILE_H < _tileClip.bottom;
- u--, s.x -= 16, s.y += 8 ) {
+ u--, s.x -= 16, s.y += 8) {
if (s.x < _tileClip.right && s.y > _tileClip.top) {
tileIndex = tilePlatform->tiles[u][v];
@@ -955,7 +955,7 @@
}
}
- if (mid < _queueCount ) {
+ if (mid < _queueCount) {
memmove(tilePoint + 1, tilePoint, (_queueCount - mid) * sizeof (*tilePoint));
}
_queueCount++;
@@ -1211,7 +1211,7 @@
for (dir = 0; dir < 8; dir++) {
terrainMask = terraComp[dir];
- if (terrainMask & SAGA_IMPASSABLE ) {
+ if (terrainMask & SAGA_IMPASSABLE) {
continue;
}
@@ -1352,11 +1352,11 @@
continue;
}
- tile = getTile(u1, v1, _platformHeight );
+ tile = getTile(u1, v1, _platformHeight);
if (tile != NULL) {
mask = tile->terrainMask;
if (((mask != 0) && (tile->GetFGDAttr() >= kTerrBlock)) ||
- ((mask != 0xFFFF) && (tile->GetBGDAttr() >= kTerrBlock)) ) {
+ ((mask != 0xFFFF) && (tile->GetBGDAttr() >= kTerrBlock))) {
pcell->visited = 1;
}
} else {
@@ -1453,7 +1453,7 @@
actor->_walkStepsCount = i;
if (i) {
actor->setTileDirectionsSize(i, false);
- memcpy(actor->_tileDirections, res, i );
+ memcpy(actor->_tileDirections, res, i);
}
}
@@ -1586,7 +1586,7 @@
actor->_walkStepsCount = i;
if (i) {
actor->setTileDirectionsSize(i, false);
- memcpy(actor->_tileDirections, res, i );
+ memcpy(actor->_tileDirections, res, i);
}
}
Modified: scummvm/trunk/engines/saga/puzzle.cpp
===================================================================
--- scummvm/trunk/engines/saga/puzzle.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/saga/puzzle.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -459,9 +459,9 @@
_vm->getTimerManager()->installTimerProc(&hintTimerCallback, 50*1000000, this);
_vm->_interface->converseClear();
- _vm->_interface->converseAddText(optionsStr[_lang][kROAccept], 0, 1, 0, 0 );
- _vm->_interface->converseAddText(optionsStr[_lang][kRODecline], 0, 2, 0, 0 );
- _vm->_interface->converseAddText(optionsStr[_lang][kROLater], 0, 0, 0, 0 );
+ _vm->_interface->converseAddText(optionsStr[_lang][kROAccept], 0, 1, 0, 0);
+ _vm->_interface->converseAddText(optionsStr[_lang][kRODecline], 0, 2, 0, 0);
+ _vm->_interface->converseAddText(optionsStr[_lang][kROLater], 0, 0, 0, 0);
_vm->_interface->converseDisplayText();
break;
Modified: scummvm/trunk/engines/saga/script.cpp
===================================================================
--- scummvm/trunk/engines/saga/script.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/saga/script.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -1315,7 +1315,7 @@
// engine did it, but it appears to work.
_pointerObject = ID_NOTHING;
- setLeftButtonVerb( verb );
+ setLeftButtonVerb(verb);
showVerb();
}
@@ -1549,7 +1549,7 @@
}
if (_pointerObject != ID_NOTHING) {
- hitObject( leftButton );
+ hitObject(leftButton);
} else {
_pendingObject[0] = ID_NOTHING;
_pendingObject[1] = ID_NOTHING;
@@ -1618,7 +1618,7 @@
_vm->_actor->actorWalkTo(ID_PROTAG, pickLocation);
} else {
if (_pendingVerb == getVerbType(kVerbLookAt)) {
- if (objectTypeId(_pendingObject[0]) != kGameObjectActor ) {
+ if (objectTypeId(_pendingObject[0]) != kGameObjectActor) {
_vm->_actor->actorWalkTo(ID_PROTAG, pickLocation);
} else {
doVerb();
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/sci/console.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -1134,7 +1134,7 @@
}
bool Console::cmdRestartGame(int argc, const char **argv) {
- _engine->_gamestate->abortScriptProcessing = kAbortRestartGame;;
+ _engine->_gamestate->abortScriptProcessing = kAbortRestartGame;
return Cmd_Exit(0, 0);
}
Modified: scummvm/trunk/engines/sword1/router.cpp
===================================================================
--- scummvm/trunk/engines/sword1/router.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/sword1/router.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -845,7 +845,7 @@
do {
walkAnim[frame].frame += 104;//turning left
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
}
if (((lastDir == 1) || (lastDir == -7)) || ((lastDir == 2) || (lastDir == -6))) {
// turn at the end of the current walk
@@ -853,7 +853,7 @@
do {
walkAnim[frame].frame += 200; //was 60 now 116
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
}
lastDir = currentDir;
}
@@ -1272,7 +1272,7 @@
do {
walkAnim[frame].frame += 104;//turning left
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
}
if (((lastDir == 1) || (lastDir == -7)) || ((lastDir == 2) || (lastDir == -6))) {
// turn at the end of the current walk
@@ -1280,7 +1280,7 @@
do {
walkAnim[frame].frame += 200; //was 60 now 116
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
}
}
// all turns checked
@@ -1305,7 +1305,7 @@
do {
walkAnim[frame].frame += 278;//stopping right
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
walkAnim[stepCount].frame = 308;
walkAnim[stepCount].step = 7;
walkAnim[stepCount].dir = currentDir;
@@ -1316,7 +1316,7 @@
do {
walkAnim[frame].frame += 279;//stopping right
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
walkAnim[stepCount].frame = 315;
walkAnim[stepCount].step = 7;
walkAnim[stepCount].dir = currentDir;
@@ -1332,7 +1332,7 @@
do {
walkAnim[frame].frame += 244;//stopping left
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
walkAnim[stepCount].frame = 322;
walkAnim[stepCount].step = 7;
walkAnim[stepCount].dir = currentDir;
@@ -1343,7 +1343,7 @@
do {
walkAnim[frame].frame += 245;//stopping left
frame += 1;
- } while (frame < lastCount );
+ } while (frame < lastCount);
walkAnim[stepCount].frame = 329;
walkAnim[stepCount].step = 7;
walkAnim[stepCount].dir = currentDir;
@@ -2097,9 +2097,9 @@
int signY = (deltaY > 0);
int slope;
- if ((ABS(deltaY) * DIAGONALX ) < (ABS(deltaX) * DIAGONALY / 2))
+ if ((ABS(deltaY) * DIAGONALX) < (ABS(deltaX) * DIAGONALY / 2))
slope = 0;// its flat
- else if ((ABS(deltaY) * DIAGONALX / 2) > (ABS(deltaX) * DIAGONALY ) )
+ else if ((ABS(deltaY) * DIAGONALX / 2) > (ABS(deltaX) * DIAGONALY))
slope = 2;// its vertical
else
slope = 1;// its diagonal
Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/sword1/screen.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -366,7 +366,7 @@
if (_currentScreen == 54) {
// rm54 has a BACKGROUND parallax layer in parallax[0]
- if (_parallax[0] && !SwordEngine::isPsx() ) //Avoid drawing this parallax on PSX edition, it gets occluded by background
+ if (_parallax[0] && !SwordEngine::isPsx()) //Avoid drawing this parallax on PSX edition, it gets occluded by background
renderParallax(_parallax[0]);
uint8 *src = _layerBlocks[0];
uint8 *dest = _screenBuf;
@@ -539,7 +539,7 @@
|| (compact->o_resource == LVSFLY) || (!(compact->o_resource == GEORGE_MEGA) && (sprSizeX < 260))))
drawSprite(sprData + incr, spriteX, spriteY, sprSizeX, sprSizeY, sprPitch);
else if (((sprSizeX >= 260) && (sprSizeX < 450)) || ((compact->o_resource == GMWRITH) && (sprSizeX < 515)) // a psx shrinked sprite (1/2 width)
- || ((compact->o_resource == GMPOWER) && (sprSizeX < 515)) ) // some needs to be hardcoded, headers don't give useful infos
+ || ((compact->o_resource == GMPOWER) && (sprSizeX < 515))) // some needs to be hardcoded, headers don't give useful infos
drawPsxHalfShrinkedSprite(sprData + incr, spriteX, spriteY, sprSizeX / 2, sprSizeY, sprPitch / 2);
else if (sprSizeX >= 450) // A PSX double shrinked sprite (1/3 width)
drawPsxFullShrinkedSprite(sprData + incr, spriteX, spriteY, sprSizeX / 3, sprSizeY, sprPitch / 3);
@@ -1187,7 +1187,7 @@
gridW *= 2; // and masking problems when sprites are stretched in width
uint16 bottomSprPos = (*pSprY + (*pSprHeight) * 2); //Position of bottom line of sprite
- if ( bottomSprPos > _scrnSizeY ) { //Check that resized psx sprite isn't drawn outside of screen boundaries
+ if (bottomSprPos > _scrnSizeY) { //Check that resized psx sprite isn't drawn outside of screen boundaries
uint16 outScreen = bottomSprPos - _scrnSizeY;
*pSprHeight -= (outScreen % 2) ? (outScreen + 1) / 2 : outScreen / 2;
}
Modified: scummvm/trunk/engines/sword1/text.cpp
===================================================================
--- scummvm/trunk/engines/sword1/text.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/sword1/text.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -49,7 +49,7 @@
_fontId = (czechVersion) ? CZECH_GAME_FONT : GAME_FONT;
_font = (uint8*)_resMan->openFetchRes(_fontId);
- _joinWidth = charWidth( SPACE ) - 2 * OVERLAP;
+ _joinWidth = charWidth(SPACE) - 2 * OVERLAP;
_charHeight = _resMan->getUint16(_resMan->fetchFrame(_font, 0)->height); // all chars have the same height
for (int i = 0; i < MAX_TEXT_OBS; i++)
_textBlocks[i] = NULL;
@@ -145,12 +145,12 @@
// (with a separating space character - also overlapped)
uint16 spaceNeeded = _joinWidth + wordWidth;
- if (line[lineNo].width + spaceNeeded <= maxWidth ) {
+ if (line[lineNo].width + spaceNeeded <= maxWidth) {
line[lineNo].width += spaceNeeded;
line[lineNo].length += 1 + wordLength; // NB. space+word characters
} else { // put word (without separating SPACE) at start of next line
lineNo++;
- assert( lineNo < MAX_LINES );
+ assert(lineNo < MAX_LINES);
line[lineNo].width = wordWidth;
line[lineNo].length = wordLength;
}
Modified: scummvm/trunk/engines/sword2/mouse.cpp
===================================================================
--- scummvm/trunk/engines/sword2/mouse.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/sword2/mouse.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -341,7 +341,7 @@
if ((icon_list[hit] == OPTIONS_ICON || icon_list[hit] == QUIT_ICON
|| icon_list[hit] == SAVE_ICON || icon_list[hit] == RESTORE_ICON
- || icon_list[hit] == RESTART_ICON ) && Sword2Engine::isPsx() )
+ || icon_list[hit] == RESTART_ICON) && Sword2Engine::isPsx())
return;
// No save when dead
Modified: scummvm/trunk/engines/toon/anim.cpp
===================================================================
--- scummvm/trunk/engines/toon/anim.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/anim.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -158,7 +158,7 @@
int32 destPitch = surface.pitch;
uint8 *srcRow = _frames[frame]._data;
- uint8 *curRow = (uint8 *)surface.pixels + (yy + _frames[frame]._y1 + _y1) * destPitch + (xx + _x1 + _frames[frame]._x1) ;
+ uint8 *curRow = (uint8 *)surface.pixels + (yy + _frames[frame]._y1 + _y1) * destPitch + (xx + _x1 + _frames[frame]._x1);
for (int32 y = 0; y < rectY; y++) {
uint8 *cur = curRow;
uint8 *c = srcRow + y * (_frames[frame]._x2 - _frames[frame]._x1);
@@ -344,20 +344,20 @@
return;
if (rectX + xx + _x1 + _frames[frame]._x1 >= pic->getWidth())
- rectX = pic->getWidth() - xx - _x1 - _frames[frame]._x1 ;
+ rectX = pic->getWidth() - xx - _x1 - _frames[frame]._x1;
if (rectX < 0)
return;
if (rectY + yy + _y1 + _frames[frame]._y1 >= pic->getHeight())
- rectY = pic->getHeight() - yy - _y1 - _frames[frame]._y1 ;
+ rectY = pic->getHeight() - yy - _y1 - _frames[frame]._y1;
if (rectY < 0)
return;
int32 destPitch = pic->getWidth();
uint8 *c = _frames[frame]._data;
- uint8 *curRow = (uint8 *)pic->getDataPtr() + (yy + _frames[frame]._y1 + _y1) * destPitch + (xx + _x1 + _frames[frame]._x1) ;
+ uint8 *curRow = (uint8 *)pic->getDataPtr() + (yy + _frames[frame]._y1 + _y1) * destPitch + (xx + _x1 + _frames[frame]._x1);
for (int32 y = 0; y < rectY; y++) {
unsigned char *cur = curRow;
for (int32 x = 0; x < rectX; x++) {
@@ -477,7 +477,7 @@
_y = y;
_z = z;
} else {
- _x = x - _animation->_x1 ;
+ _x = x - _animation->_x1;
_y = y - _animation->_y1;
_z = z;
}
@@ -547,7 +547,7 @@
if (relative || !_animation)
_x = x;
else
- _x = x - _animation->_x1 ;
+ _x = x - _animation->_x1;
}
void AnimationInstance::setY(int32 y, bool relative) {
@@ -555,7 +555,7 @@
if (relative || !_animation)
_y = y;
else
- _y = y - _animation->_y1 ;
+ _y = y - _animation->_y1;
}
void AnimationInstance::setZ(int32 z, bool relative) {
@@ -572,15 +572,15 @@
}
int32 AnimationInstance::getX2() const {
- return _x + _animation->_x1 ;
+ return _x + _animation->_x1;
}
int32 AnimationInstance::getY2() const {
- return _y + _animation->_y1 ;
+ return _y + _animation->_y1;
}
int32 AnimationInstance::getZ2() const {
- return _z ;
+ return _z;
}
void AnimationInstance::save(Common::WriteStream *stream) {
@@ -659,7 +659,7 @@
void AnimationManager::removeAllInstances(AnimationInstanceType type) {
debugC(1, kDebugAnim, "removeInstance(type)");
- for (int32 i = (int32)_instances.size(); i >= 0 ; i--) {
+ for (int32 i = (int32)_instances.size(); i >= 0; i--) {
if (_instances[i]->getType() & type)
_instances.remove_at(i);
}
Modified: scummvm/trunk/engines/toon/audio.cpp
===================================================================
--- scummvm/trunk/engines/toon/audio.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/audio.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -117,7 +117,7 @@
_channels[2]->stop(false);
}
- Common::SeekableReadStream *stream ;
+ Common::SeekableReadStream *stream;
if (genericVoice)
stream = _audioPacks[0]->getStream(id);
else
@@ -132,7 +132,7 @@
debugC(4, kDebugAudio, "playSFX(%d, %d)", id, (genericSFX) ? 1 : 0);
// find a free SFX channel
- Common::SeekableReadStream *stream ;
+ Common::SeekableReadStream *stream;
if (genericSFX)
stream = _audioPacks[2]->getStream(id, true);
@@ -288,7 +288,7 @@
void AudioStreamInstance::decodeADPCM(uint8 *comp, int16 *dest, int32 packetSize) {
debugC(5, kDebugAudio, "decodeADPCM(comp, dest, %d)", packetSize);
- int32 numSamples = 2 * packetSize ;
+ int32 numSamples = 2 * packetSize;
int32 v18 = _lastADPCMval1;
int32 v19 = _lastADPCMval2;
for (int32 i = 0; i < numSamples; i++) {
Modified: scummvm/trunk/engines/toon/flux.cpp
===================================================================
--- scummvm/trunk/engines/toon/flux.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/flux.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -80,7 +80,7 @@
int32 v6 = 1 << originalFacing;
int32 facingMask = 0;
do {
- if ( v6 & animFacingFlag) {
+ if (v6 & animFacingFlag) {
facingMask = v6;
} else if (v5 & animFacingFlag) {
facingMask = v5;
@@ -91,9 +91,9 @@
while (!facingMask);
int32 finalFacing = 0;
- for (finalFacing = 0; ; ++finalFacing ) {
+ for (finalFacing = 0; ; ++finalFacing) {
facingMask >>= 1;
- if ( !facingMask )
+ if (!facingMask)
break;
}
Modified: scummvm/trunk/engines/toon/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/toon/hotspot.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/hotspot.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -65,7 +65,7 @@
if (_items[i].getMode() == -1)
return _items[i].getRef();
- return i ;
+ return i;
}
}
}
Modified: scummvm/trunk/engines/toon/path.cpp
===================================================================
--- scummvm/trunk/engines/toon/path.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/path.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -99,7 +99,7 @@
int32 lT = 1;
while (1) {
- lT = lMin << 1 ;
+ lT = lMin << 1;
if (lT <= _count) {
if (lT < _count) {
if (_data[lT + 1]._weight < _data[lT]._weight)
@@ -169,7 +169,7 @@
origY = yy;
for (int y = 0; y < _height; y++) {
- for (int x = 0; x < _width ; x++) {
+ for (int x = 0; x < _width; x++) {
if (isWalkable(x, y)) {
int32 ndist = (x - xx) * (x - xx) + (y - yy) * (y - yy);
int32 ndist2 = (x - origX) * (x - origX) + (y - origY) * (y - origY);
Modified: scummvm/trunk/engines/toon/picture.cpp
===================================================================
--- scummvm/trunk/engines/toon/picture.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/picture.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -161,7 +161,7 @@
int32 destPitch = surface.pitch;
int32 srcPitch = _width;
- uint8 *c = _data + _width * dy + dx ;
+ uint8 *c = _data + _width * dy + dx;
uint8 *curRow = (uint8 *)surface.pixels + y * destPitch + x;
for (int32 yy = 0; yy < ry; yy++) {
@@ -190,14 +190,14 @@
int32 destPitch = surface.pitch;
int32 srcPitch = _width;
- uint8 *c = _data + _width * dy + dx ;
+ uint8 *c = _data + _width * dy + dx;
uint8 *curRow = (uint8 *)surface.pixels + y * destPitch + x;
for (int32 yy = 0; yy < ry; yy++) {
uint8 *curSrc = c;
uint8 *cur = curRow;
for (int32 xx = 0; xx < rx; xx++) {
- *cur = *curSrc ;
+ *cur = *curSrc;
curSrc++;
cur++;
}
Modified: scummvm/trunk/engines/toon/resource.cpp
===================================================================
--- scummvm/trunk/engines/toon/resource.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/resource.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -122,7 +122,7 @@
debugC(1, kDebugResource, "createReadStream(%s)", fileName.c_str());
int32 offset = 0;
- int32 size = 0 ;
+ int32 size = 0;
for (uint32 i = 0; i < _numFiles; i++) {
if (fileName.compareToIgnoreCase(_files[i]._name) == 0) {
size = _files[i]._size;
Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/engines/toon/toon.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -86,7 +86,7 @@
_currentTextLine = 0;
_currentTextLineId = -1;
_currentTextLineX = 0;
- _currentTextLineY = 0 ;
+ _currentTextLineY = 0;
_currentTextLineCharacterId = 0;
_saveBufferStream = new Common::MemoryWriteStreamDynamic();
Modified: scummvm/trunk/graphics/VectorRendererSpec.cpp
===================================================================
--- scummvm/trunk/graphics/VectorRendererSpec.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/graphics/VectorRendererSpec.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -255,7 +255,7 @@
fillSurface() {
byte *ptr = (byte *)_activeSurface->getBasePtr(0, 0);
- int h = _activeSurface->h ;
+ int h = _activeSurface->h;
int pitch = _activeSurface->pitch;
if (Base::_fillMode == kFillBackground) {
Modified: scummvm/trunk/gui/ThemeParser.cpp
===================================================================
--- scummvm/trunk/gui/ThemeParser.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/gui/ThemeParser.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -144,7 +144,7 @@
Graphics::DrawStep *ThemeParser::newDrawStep() {
assert(_defaultStepGlobal);
- Graphics::DrawStep *step = 0 ; //new DrawStep;
+ Graphics::DrawStep *step = 0; //new DrawStep;
if (_defaultStepLocal) {
step = new Graphics::DrawStep(*_defaultStepLocal);
Modified: scummvm/trunk/sound/decoders/flac.cpp
===================================================================
--- scummvm/trunk/sound/decoders/flac.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/sound/decoders/flac.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -140,7 +140,7 @@
bool seek(const Timestamp &where);
Timestamp getLength() const { return _length; }
- bool isStreamDecoderReady() const { return getStreamDecoderState() == FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC ; }
+ bool isStreamDecoderReady() const { return getStreamDecoderState() == FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC; }
protected:
uint getChannels() const { return MIN<uint>(_streaminfo.channels, MAX_OUTPUT_CHANNELS); }
@@ -553,7 +553,7 @@
for (; numSamples > 0; numSamples -= numChannels) {
for (uint i = 0; i < numChannels; ++i)
- *bufDestination++ = static_cast<SampleType>(*(inChannels[i]++) >> kPower) ;
+ *bufDestination++ = static_cast<SampleType>(*(inChannels[i]++) >> kPower);
}
} else {
for (; numSamples > 0; numSamples -= numChannels) {
Modified: scummvm/trunk/sound/softsynth/opl/mame.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/opl/mame.cpp 2010-10-12 02:18:11 UTC (rev 53160)
+++ scummvm/trunk/sound/softsynth/opl/mame.cpp 2010-10-12 04:19:58 UTC (rev 53161)
@@ -694,7 +694,7 @@
return 0;
}
/* make total level table */
- for (t = 0; t < EG_ENT - 1 ; t++) {
+ for (t = 0; t < EG_ENT - 1; t++) {
rate = ((1 << TL_BITS) - 1) / pow(10.0, EG_STEP * t / 20); /* dB -> voltage */
TL_TABLE[ t] = (int)rate;
TL_TABLE[TL_MAX + t] = -TL_TABLE[t];
@@ -1082,10 +1082,10 @@
for (i = 0xff; i >= 0x20; i--)
OPLWriteReg(OPL,i,0);
/* reset OPerator parameter */
- for (c = 0; c < OPL->max_ch ;c++ ) {
+ for (c = 0; c < OPL->max_ch; c++) {
OPL_CH *CH = &OPL->P_CH[c];
/* OPL->P_CH[c].PAN = OPN_CENTER; */
- for (s = 0; s < 2; s++ ) {
+ for (s = 0; s < 2; s++) {
/* wave table */
CH->SLOT[s].wavetable = &SIN_TABLE[0];
/* CH->SLOT[s].evm = ENV_MOD_RR; */
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