diff options
| author | Torbjörn Andersson | 2005-05-29 18:14:59 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-05-29 18:14:59 +0000 |
| commit | 4fbb6c29cb8e39077e09a3b334dec51f447e15a4 (patch) | |
| tree | b709f07448c9177f94d4bf889769fc895af9a130 /scumm | |
| parent | 9ffe00b78d3d598b17b2614d0ef6295c5caf1c74 (diff) | |
| download | scummvm-rg350-4fbb6c29cb8e39077e09a3b334dec51f447e15a4.tar.gz scummvm-rg350-4fbb6c29cb8e39077e09a3b334dec51f447e15a4.tar.bz2 scummvm-rg350-4fbb6c29cb8e39077e09a3b334dec51f447e15a4.zip | |
Whitespace
svn-id: r18296
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse.cpp | 2 | ||||
| -rw-r--r-- | scumm/imuse_player.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index fa46a5eba7..a06395b064 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -726,7 +726,7 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) { 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]); diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 900309780d..2502f55d3c 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -1120,7 +1120,7 @@ void Player::transitionParameters() { } 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) { |