[Scummvm-git-logs] scummvm master -> e7eaff13bf5f6d4bd9cc9c02f3b9f18e643995cd
sev-
sev at scummvm.org
Sun Feb 4 13:00:14 CET 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e7eaff13bf JANITORIAL: Fix code formatting
Commit: e7eaff13bf5f6d4bd9cc9c02f3b9f18e643995cd
https://github.com/scummvm/scummvm/commit/e7eaff13bf5f6d4bd9cc9c02f3b9f18e643995cd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-02-04T12:59:57+01:00
Commit Message:
JANITORIAL: Fix code formatting
Changed paths:
engines/scumm/players/player_he.cpp
diff --git a/engines/scumm/players/player_he.cpp b/engines/scumm/players/player_he.cpp
index 163f4f1..74041e5 100644
--- a/engines/scumm/players/player_he.cpp
+++ b/engines/scumm/players/player_he.cpp
@@ -74,8 +74,7 @@ Player_HE::~Player_HE() {
void Player_HE::setMusicVolume(int vol) {
_masterVolume = vol;
- for (int chan = 0; chan < 16; chan++)
- {
+ for (int chan = 0; chan < 16; chan++) {
byte volume = (_channelVolume[chan] * vol) / 256;
if (_midi)
_midi->send(0x07b0 | chan | (volume << 16));
@@ -83,7 +82,7 @@ void Player_HE::setMusicVolume(int vol) {
}
void Player_HE::onTimer(void *data) {
- Player_HE *player = (Player_HE*)data;
+ Player_HE *player = (Player_HE *)data;
Common::StackLock lock(player->_mutex);
if (player->_parser)
player->_parser->onTimer();
@@ -228,8 +227,7 @@ void Player_HE::send(uint32 b) {
byte cmd = b & 0xf0;
byte op1 = (b >> 8) & 0x7f;
byte op2 = (b >> 16) & 0x7f;
- if (cmd == 0xb0 && op1 == 0x07)
- {
+ if (cmd == 0xb0 && op1 == 0x07) {
_channelVolume[chan] = op2;
op2 = (op2 * _masterVolume) / 256;
b = (b & 0xffff) | (op2 << 16);
More information about the Scummvm-git-logs
mailing list