[Scummvm-cvs-logs] scummvm master -> fad5041a3206da1649702874b563986d65a3626a

[lordhoto]

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:
fad5041a32 TOLTECS: Replace ceil with integer maths.


Commit: fad5041a3206da1649702874b563986d65a3626a
    https://github.com/scummvm/scummvm/commit/fad5041a3206da1649702874b563986d65a3626a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-20T18:01:39-07:00

Commit Message:
TOLTECS: Replace ceil with integer maths.

This removes an unnecessary use of floating point maths.

Changed paths:
    engines/toltecs/menu.cpp



diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index d7ba254..dfdad74 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -582,19 +582,20 @@ void MenuSystem::changeVolumeBar(ItemID itemID, int delta) {
 	switch (itemID) {
 	case kItemIdVoices:
 		_vm->_cfgVoicesVolume = CLIP(_vm->_cfgVoicesVolume + delta, 0, 20);
-		newVolume = ceil((double)_vm->_cfgVoicesVolume * Audio::Mixer::kMaxChannelVolume / 20);
+		// Always round volume up instead of down.
+		newVolume = (_vm->_cfgVoicesVolume * Audio::Mixer::kMaxChannelVolume + 19) / 20;
 		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, newVolume);
 		ConfMan.setInt("speech_volume", newVolume);
 		break;
 	case kItemIdMusic:
 		_vm->_cfgMusicVolume = CLIP(_vm->_cfgMusicVolume + delta, 0, 20);
-		newVolume = ceil((double)_vm->_cfgMusicVolume * Audio::Mixer::kMaxChannelVolume / 20);
+		newVolume = (_vm->_cfgMusicVolume * Audio::Mixer::kMaxChannelVolume + 19) / 20;
 		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, newVolume);
 		ConfMan.setInt("music_volume", newVolume);
 		break;
 	case kItemIdSoundFX:
 		_vm->_cfgSoundFXVolume = CLIP(_vm->_cfgSoundFXVolume + delta, 0, 20);
-		newVolume = ceil((double)_vm->_cfgSoundFXVolume * Audio::Mixer::kMaxChannelVolume / 20);
+		newVolume = (_vm->_cfgSoundFXVolume * Audio::Mixer::kMaxChannelVolume + 19) / 20;
 		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, newVolume);
 		ConfMan.setInt("sfx_volume", newVolume);
 		break;