[Scummvm-git-logs] scummvm master -> 82e0ad732e981d684024e9c16aa8f525412a0d1d
dreammaster
dreammaster at scummvm.org
Fri Sep 2 04:53:11 CEST 2016
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:
82e0ad732e TITANIC: Fix compiler warnings
Commit: 82e0ad732e981d684024e9c16aa8f525412a0d1d
https://github.com/scummvm/scummvm/commit/82e0ad732e981d684024e9c16aa8f525412a0d1d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-01T22:53:02-04:00
Commit Message:
TITANIC: Fix compiler warnings
Changed paths:
engines/titanic/core/room_item.cpp
engines/titanic/sound/qmixer.cpp
diff --git a/engines/titanic/core/room_item.cpp b/engines/titanic/core/room_item.cpp
index 541a8e1..49b3232 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 e0e9c60..c095b84 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) {
More information about the Scummvm-git-logs
mailing list