diff options
| author | Paul Gilbert | 2018-08-17 20:30:20 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2018-08-17 20:30:20 -0700 |
| commit | 11e33ba3fc1b65789358485fa50cdbc0cf26aac7 (patch) | |
| tree | ebb245cf6617e1ac0b35bf3681307bcbc541b230 /engines/scumm/players | |
| parent | c8d3af3874d7c814a9f1f03ad740c3e9f8386eaa (diff) | |
| download | scummvm-rg350-11e33ba3fc1b65789358485fa50cdbc0cf26aac7.tar.gz scummvm-rg350-11e33ba3fc1b65789358485fa50cdbc0cf26aac7.tar.bz2 scummvm-rg350-11e33ba3fc1b65789358485fa50cdbc0cf26aac7.zip | |
JANITORIAL: Removing trailing spaces after int casts
Diffstat (limited to 'engines/scumm/players')
| -rw-r--r-- | engines/scumm/players/player_v1.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/players/player_v2.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/players/player_v2base.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/players/player_v1.cpp b/engines/scumm/players/player_v1.cpp index 041f556120..b65c8a4d56 100644 --- a/engines/scumm/players/player_v1.cpp +++ b/engines/scumm/players/player_v1.cpp @@ -416,7 +416,7 @@ void Player_V1::nextPCjrCmd() { switch (_channels[i].hull_counter) { case 1: _channels[i].volume -= _channels[i].attack; - if ((int) _channels[i].volume <= 0) { + if ((int)_channels[i].volume <= 0) { _channels[i].volume = 0; _channels[i].hull_counter++; } @@ -432,7 +432,7 @@ void Player_V1::nextPCjrCmd() { if (--_channels[i].sustctr < 0) { _channels[i].sustctr = _channels[i].sustain_2; _channels[i].volume += _channels[i].sustain_1; - if ((int) _channels[i].volume >= 15) { + if ((int)_channels[i].volume >= 15) { _channels[i].volume = 15; _channels[i].hull_counter++; } diff --git a/engines/scumm/players/player_v2.cpp b/engines/scumm/players/player_v2.cpp index c7ebd8abff..b58be8d881 100644 --- a/engines/scumm/players/player_v2.cpp +++ b/engines/scumm/players/player_v2.cpp @@ -85,7 +85,7 @@ void Player_V2::setMusicVolume (int vol) { if (out > 0xffff) _volumetable[i] = 0xffff; else - _volumetable[i] = (int) out; + _volumetable[i] = (int)out; out /= 1.258925412; /* = 10 ^ (2/20) = 2dB */ } @@ -191,7 +191,7 @@ int Player_V2::readBuffer(int16 *data, const int numSamples) { void Player_V2::lowPassFilter(int16 *sample, uint len) { for (uint i = 0; i < len; i++) { - _level = (int) (_level * _decay + _level = (int)(_level * _decay + sample[0] * (0x10000 - _decay)) >> 16; sample[0] = sample[1] = _level; sample += 2; diff --git a/engines/scumm/players/player_v2base.cpp b/engines/scumm/players/player_v2base.cpp index 8df4afc198..7d3dab7935 100644 --- a/engines/scumm/players/player_v2base.cpp +++ b/engines/scumm/players/player_v2base.cpp @@ -602,8 +602,8 @@ void Player_V2Base::next_freqs(ChannelInfo *channel) { channel->d.freqmod_offset -= channel->d.freqmod_modulo; channel->d.freq = - (int) (freqmod_table[channel->d.freqmod_table + (channel->d.freqmod_offset >> 4)]) - * (int) channel->d.freqmod_multiplier / 256 + (int)(freqmod_table[channel->d.freqmod_table + (channel->d.freqmod_offset >> 4)]) + * (int)channel->d.freqmod_multiplier / 256 + channel->d.base_freq; debug(9, "Freq: %d/%d, %d/%d/%d*%d %d", |