[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.141,2.142 imuse_player.cpp,2.52,2.53
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Sun May 29 11:16:20 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9992
Modified Files:
imuse.cpp imuse_player.cpp
Log Message:
Whitespace
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.141
retrieving revision 2.142
diff -u -d -r2.141 -r2.142
--- imuse.cpp 28 May 2005 12:29:31 -0000 2.141
+++ imuse.cpp 29 May 2005 18:14:59 -0000 2.142
@@ -726,7 +726,7 @@
return -1;
else {
warning("IMuse doCommand(6) - setImuseMasterVolume (%d)", a[1]);
- return setImuseMasterVolume((a[1] << 1) |(a[1] ? 0 : 1)); // Convert from 0-127 to 0-255
+ return setImuseMasterVolume((a[1] << 1) | (a[1] ? 0 : 1)); // Convert from 0-127 to 0-255
}
case 7:
warning("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.52
retrieving revision 2.53
diff -u -d -r2.52 -r2.53
--- imuse_player.cpp 27 May 2005 10:25:15 -0000 2.52
+++ imuse_player.cpp 29 May 2005 18:14:59 -0000 2.53
@@ -1120,7 +1120,7 @@
}
uint Player::getBeatIndex() {
- return (_parser ?(_parser->getTick() / TICKS_PER_BEAT + 1) : 0);
+ return (_parser ? (_parser->getTick() / TICKS_PER_BEAT + 1) : 0);
}
void Player::removePart(Part *part) {
More information about the Scummvm-git-logs
mailing list