[Scummvm-cvs-logs] SF.net SVN: scummvm:[44029] scummvm/trunk/engines/scumm
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Fri Sep 11 12:13:54 CEST 2009
Revision: 44029
http://scummvm.svn.sourceforge.net/scummvm/?rev=44029&view=rev
Author: Kirben
Date: 2009-09-11 10:13:54 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Remove excess spaces.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/camera.cpp
scummvm/trunk/engines/scumm/he/script_v100he.cpp
scummvm/trunk/engines/scumm/he/script_v70he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/trunk/engines/scumm/room.cpp
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/script_v5.cpp
scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
Modified: scummvm/trunk/engines/scumm/camera.cpp
===================================================================
--- scummvm/trunk/engines/scumm/camera.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/camera.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -76,7 +76,7 @@
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++) {
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -1684,7 +1684,7 @@
// 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:
Modified: scummvm/trunk/engines/scumm/he/script_v70he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v70he.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/he/script_v70he.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -484,7 +484,7 @@
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:
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -1944,7 +1944,7 @@
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:
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -300,7 +300,7 @@
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");
}
Modified: scummvm/trunk/engines/scumm/room.cpp
===================================================================
--- scummvm/trunk/engines/scumm/room.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/room.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -52,7 +52,7 @@
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 @@
// 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();
}
Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/saveload.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -125,7 +125,7 @@
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 @@
_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 @@
// 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 @@
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 @@
SaveGameHeader hdr;
if (slot < 0)
- return 0;
+ return 0;
Common::String filename = makeSavegameName(target, slot, false);
if (!(in = g_system->getSavefileManager()->openForLoading(filename))) {
Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/script_v5.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -1090,7 +1090,7 @@
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 @@
// 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:
Modified: scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/imuse_channel.cpp 2009-09-11 09:31:57 UTC (rev 44028)
+++ scummvm/trunk/engines/scumm/smush/imuse_channel.cpp 2009-09-11 10:13:54 UTC (rev 44029)
@@ -182,9 +182,9 @@
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;
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