From 122ff32d75fab5430fc24b6c9b469de039a274f5 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Fri, 11 Sep 2009 10:13:54 +0000 Subject: Remove excess spaces. svn-id: r44029 --- engines/scumm/camera.cpp | 2 +- engines/scumm/he/script_v100he.cpp | 2 +- engines/scumm/he/script_v70he.cpp | 2 +- engines/scumm/he/script_v72he.cpp | 2 +- engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 2 +- engines/scumm/room.cpp | 4 ++-- engines/scumm/saveload.cpp | 10 +++++----- engines/scumm/script_v5.cpp | 12 ++++++------ engines/scumm/smush/imuse_channel.cpp | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp index b675714959..c12c956134 100644 --- a/engines/scumm/camera.cpp +++ b/engines/scumm/camera.cpp @@ -76,7 +76,7 @@ void ScummEngine::setCameraFollows(Actor *a, bool setCamera) { t = a->getPos().x / 8 - _screenStartStrip; - if (t < camera._leftTrigger || t > camera._rightTrigger || setCamera == true) + if (t < camera._leftTrigger || t > camera._rightTrigger || setCamera == true) setCameraAt(a->getPos().x, 0); for (i = 1; i < _numActors; i++) { diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 29f611a58f..b304454e19 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -1684,7 +1684,7 @@ void ScummEngine_v100he::o100_setSystemMessage() { // one still would have to convert 'name' to the correct encoding. //_system->setWindowCaption((const char *)name); break; - case 131: // Set Version + case 131: // Set Version debug(1,"o100_setSystemMessage: (%d) %s", subOp, name); break; default: diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp index 35dbfef405..979b2b3df4 100644 --- a/engines/scumm/he/script_v70he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -484,7 +484,7 @@ void ScummEngine_v70he::o70_setSystemMessage() { case 240: debug(1,"o70_setSystemMessage: (%d) %s", subOp, name); break; - case 241: // Set Version + case 241: // Set Version debug(1,"o70_setSystemMessage: (%d) %s", subOp, name); break; case 242: diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index aa25313c54..baa57c7821 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -1944,7 +1944,7 @@ void ScummEngine_v72he::o72_setSystemMessage() { case 240: debug(1,"o72_setSystemMessage: (%d) %s", subOp, name); break; - case 241: // Set Version + case 241: // Set Version debug(1,"o72_setSystemMessage: (%d) %s", subOp, name); break; case 242: diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 10ebe093bf..872975854a 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -300,7 +300,7 @@ void ImuseDigiSndMgr::prepareSound(byte *ptr, SoundDesc *sound) { error("ImuseDigiSndMgr::prepareSound(%d/%s) Unknown sfx header '%s'", sound->soundId, sound->name, tag2str(tag)); } } while (tag != MKID_BE('DATA')); - sound->offsetData = ptr - s_ptr; + sound->offsetData = ptr - s_ptr; } else { error("ImuseDigiSndMgr::prepareSound(): Unknown sound format"); } diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp index 8623669dcc..5dcfd9c90f 100644 --- a/engines/scumm/room.cpp +++ b/engines/scumm/room.cpp @@ -52,7 +52,7 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { fadeOut(_switchRoomEffect2); _newEffect = _switchRoomEffect; - ScriptSlot *ss = &vm.slot[_currentScript]; + ScriptSlot *ss = &vm.slot[_currentScript]; if (_currentScript != 0xFF) { if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) { @@ -84,7 +84,7 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { // Added sound queue processing between execution of exit // script and entry script. In the case of this bug, the // entry script required that the iMuse state be fully up - // to date, including last-moment changes from the previous + // to date, including last-moment changes from the previous // exit script. _sound->processSound(); } diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 7bf61a8762..9dad8cd054 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -125,7 +125,7 @@ bool ScummEngine::canSaveGameStateCurrently() { if (_game.id == GID_CMI) return true; - // SCUMM v4+ doesn't allow saving in room 0 or if + // SCUMM v4+ doesn't allow saving in room 0 or if // VAR(VAR_MAINMENU_KEY) to set to zero. return (VAR_MAINMENU_KEY == 0xFF || (VAR(VAR_MAINMENU_KEY) != 0 && _currentRoom != 0)); } @@ -137,7 +137,7 @@ void ScummEngine::requestSave(int slot, const char *name) { _saveLoadFlag = 1; // 1 for save assert(name); strncpy(_saveLoadName, name, sizeof(_saveLoadName)); - _saveLoadName[sizeof(_saveLoadName) - 1] = 0; + _saveLoadName[sizeof(_saveLoadName) - 1] = 0; } void ScummEngine::requestLoad(int slot) { @@ -453,7 +453,7 @@ bool ScummEngine::loadState(int slot, bool compat) { // WORKAROUND bug #795214: For unknown reasons, object 819 sometimes is in // state 1 in old save games, implying it should be drawn. This in turn // results in a crash when entering the church, as object 819 is part of the - // exitof the church and there are no graphics assigned to it. + // exitof the church and there are no graphics assigned to it. if (_game.id == GID_MONKEY_VGA) { putState(819, 0); } @@ -651,7 +651,7 @@ Graphics::Surface *ScummEngine::loadThumbnailFromSlot(const char *target, int sl SaveGameHeader hdr; if (slot < 0) - return 0; + return 0; Common::String filename = ScummEngine::makeSavegameName(target, slot, false); if (!(in = g_system->getSavefileManager()->openForLoading(filename))) { @@ -689,7 +689,7 @@ bool ScummEngine::loadInfosFromSlot(const char *target, int slot, InfoStuff *stu SaveGameHeader hdr; if (slot < 0) - return 0; + return 0; Common::String filename = makeSavegameName(target, slot, false); if (!(in = g_system->getSavefileManager()->openForLoading(filename))) { diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index f83e7f2879..b86eb2b476 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -1090,7 +1090,7 @@ void ScummEngine_v5::o5_getDist() { r = 60; // WORKAROUND bug #795937 - if ((_game.id == GID_MONKEY_EGA || _game.id == GID_PASS) && o1 == 1 && o2 == 307 && vm.slot[_currentScript].number == 205 && r == 2) + if ((_game.id == GID_MONKEY_EGA || _game.id == GID_PASS) && o1 == 1 && o2 == 307 && vm.slot[_currentScript].number == 205 && r == 2) r = 3; setResult(r); @@ -1580,28 +1580,28 @@ void ScummEngine_v5::o5_resourceRoutines() { // TODO: For the following see also Hibarnatus' information on bug #805691. case 32: // TODO (apparently never used in FM-TOWNS) - debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); + debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); break; case 33: // TODO (apparently never used in FM-TOWNS) - debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); + debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); break; case 35: // TODO: Might be used to set CD volume in FM-TOWNS Loom foo = getVarOrDirectByte(PARAM_2); - debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); + debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); break; case 36: // TODO: Sets the loudness of a sound resource. Used in Indy3 and Zak. foo = getVarOrDirectByte(PARAM_2); bar = fetchScriptByte(); - debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); + debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); break; case 37: // TODO: Sets the pitch of a sound resource (pitch = foo - center semitones. // "center" is at 0x32 in the sfx resource (always 0x3C in zak256, but sometimes different in Indy3). foo = getVarOrDirectByte(PARAM_2); - debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); + debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number); break; default: diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp index c1167a57c1..c01a2acca3 100644 --- a/engines/scumm/smush/imuse_channel.cpp +++ b/engines/scumm/smush/imuse_channel.cpp @@ -182,9 +182,9 @@ void ImuseChannel::decode() { unsigned char * source = _sbuffer; while (loop_size--) { - byte v1 = *source++; - byte v2 = *source++; - byte v3 = *source++; + byte v1 = *source++; + byte v2 = *source++; + byte v3 = *source++; value = ((((v2 & 0x0f) << 8) | v1) << 4) - 0x8000; WRITE_BE_UINT16(decoded, value); decoded += 2; value = ((((v2 & 0xf0) << 4) | v3) << 4) - 0x8000; -- cgit v1.2.3