aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2014-06-02 01:00:15 +0200
committerJohannes Schickel2014-06-02 01:00:15 +0200
commit59d0874ca958c2ff12210f9f18956a01d8719e80 (patch)
tree4c987fada506ee6b8f68c7050740eea0bde2c7a1 /engines
parent7b32db3b371f487c6b79c500aece05d9e8dcb48c (diff)
downloadscummvm-rg350-59d0874ca958c2ff12210f9f18956a01d8719e80.tar.gz
scummvm-rg350-59d0874ca958c2ff12210f9f18956a01d8719e80.tar.bz2
scummvm-rg350-59d0874ca958c2ff12210f9f18956a01d8719e80.zip
SWORD25: Use float constant values in expressions which result in float.
This silences some float conversion warnings.
Diffstat (limited to 'engines')
-rw-r--r--engines/sword25/sfx/soundengine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index 4029b4e808..dcb29cb380 100644
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -114,7 +114,7 @@ float SoundEngine::getVolume(SOUND_TYPES type) {
error("Unknown SOUND_TYPE");
}
- return (float)val / 255.0;
+ return (float)val / 255.0f;
}
void SoundEngine::pauseAll() {
@@ -302,7 +302,7 @@ float SoundEngine::getSoundVolume(uint handle) {
SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return 0.f;
- return (float)_mixer->getChannelVolume(sndHandle->handle) / 255.0;
+ return (float)_mixer->getChannelVolume(sndHandle->handle) / 255.0f;
}
float SoundEngine::getSoundPanning(uint handle) {
@@ -311,7 +311,7 @@ float SoundEngine::getSoundPanning(uint handle) {
SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return 0.f;
- return (float)_mixer->getChannelBalance(sndHandle->handle) / 127.0;
+ return (float)_mixer->getChannelBalance(sndHandle->handle) / 127.0f;
}
Resource *SoundEngine::loadResource(const Common::String &fileName) {