diff options
| author | Matthew Hoops | 2015-04-11 16:11:21 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-04-11 16:12:47 -0400 |
| commit | ddf170de4a33fac4cac3093bf6dd97d253216092 (patch) | |
| tree | 1c2eb38f62d669b386f46bf660cc9d6ab2671c5e /engines/zvision/scripting/effects | |
| parent | 75acef75661cc4554ad0bf114d62bf553afae7ab (diff) | |
| download | scummvm-rg350-ddf170de4a33fac4cac3093bf6dd97d253216092.tar.gz scummvm-rg350-ddf170de4a33fac4cac3093bf6dd97d253216092.tar.bz2 scummvm-rg350-ddf170de4a33fac4cac3093bf6dd97d253216092.zip | |
ZVISION: Silence gcc warnings
Diffstat (limited to 'engines/zvision/scripting/effects')
| -rw-r--r-- | engines/zvision/scripting/effects/distort_effect.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/effects/music_effect.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/scripting/effects/distort_effect.cpp b/engines/zvision/scripting/effects/distort_effect.cpp index 78c4a1b9a8..113b5d048d 100644 --- a/engines/zvision/scripting/effects/distort_effect.cpp +++ b/engines/zvision/scripting/effects/distort_effect.cpp @@ -52,7 +52,7 @@ DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAn _diffLinScale = endLineScale - startLineScale; _frmSpeed = (float)speed / 15.0; - _frames = ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed); + _frames = (int)ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed); if (_frames <= 0) _frames = 1; diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp index ad3c0f6d22..e3fdc96dba 100644 --- a/engines/zvision/scripting/effects/music_effect.cpp +++ b/engines/zvision/scripting/effects/music_effect.cpp @@ -140,7 +140,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) { if (_crossfadeTime > 0) { if ((int32)deltaTimeInMillis > _crossfadeTime) deltaTimeInMillis = _crossfadeTime; - _newvol += floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis; + _newvol += (int)(floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis); _crossfadeTime -= deltaTimeInMillis; } else { _crossfade = false; |