aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2016-09-01 22:53:02 -0400
committerPaul Gilbert2016-09-01 22:53:02 -0400
commit82e0ad732e981d684024e9c16aa8f525412a0d1d (patch)
tree7d73a0dd28ee9b7cbd9ecbceb18388c3bbe16b7a /engines
parent23718d14abb79e3c69c446aed23653aef17bae7a (diff)
downloadscummvm-rg350-82e0ad732e981d684024e9c16aa8f525412a0d1d.tar.gz
scummvm-rg350-82e0ad732e981d684024e9c16aa8f525412a0d1d.tar.bz2
scummvm-rg350-82e0ad732e981d684024e9c16aa8f525412a0d1d.zip
TITANIC: Fix compiler warnings
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/core/room_item.cpp4
-rw-r--r--engines/titanic/sound/qmixer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/core/room_item.cpp b/engines/titanic/core/room_item.cpp
index 541a8e1a9e..49b3232ba1 100644
--- a/engines/titanic/core/room_item.cpp
+++ b/engines/titanic/core/room_item.cpp
@@ -36,8 +36,8 @@ void CRoomItem::save(SimpleFile *file, int indent) {
_exitMovieKey.save(file, indent);
file->writeQuotedLine("Room dimensions x 1000", indent);
- file->writeNumberLine(_roomDimensionX * 1000.0, indent + 1);
- file->writeNumberLine(_roomDimensionY * 1000.0, indent + 1);
+ file->writeNumberLine((int)(_roomDimensionX * 1000.0), indent + 1);
+ file->writeNumberLine((int)(_roomDimensionY * 1000.0), indent + 1);
file->writeQuotedLine("Transition Movie", indent);
_transitionMovieKey.save(file, indent);
diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp
index e0e9c60038..c095b84e17 100644
--- a/engines/titanic/sound/qmixer.cpp
+++ b/engines/titanic/sound/qmixer.cpp
@@ -66,7 +66,7 @@ void QMixer::qsWaveMixFlushChannel(int iChannel, uint flags) {
void QMixer::qsWaveMixSetPanRate(int iChannel, uint flags, uint rate) {
ChannelEntry &channel = _channels[iChannel];
channel._panRate = rate;
- channel._volumeChangeEnd = channel._volumeChangeEnd = 0;
+ channel._volumeChangeStart = channel._volumeChangeEnd = 0;
}
void QMixer::qsWaveMixSetVolume(int iChannel, uint flags, uint volume) {