[Scummvm-git-logs] scummvm master -> 1ff861ed3f4cb591e7d19b79b40a49d662a32755

dreammaster dreammaster at scummvm.org
Sun Oct 30 20:00:24 CET 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:
1ff861ed3f TITANIC: Fix somer compiler warnings


Commit: 1ff861ed3f4cb591e7d19b79b40a49d662a32755
    https://github.com/scummvm/scummvm/commit/1ff861ed3f4cb591e7d19b79b40a49d662a32755
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-30T15:00:16-04:00

Commit Message:
TITANIC: Fix somer compiler warnings

Changed paths:
    engines/titanic/sound/wave_file.cpp
    engines/titanic/star_control/star_control_sub13.cpp
    engines/titanic/support/transparency_surface.cpp



diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index ade94aa..2c583f2 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -51,9 +51,9 @@ uint CWaveFile::getDurationTicks() const {
 	// a desired size. Since I have no idea how the system API
 	// method works, for now I'm using a simple ratio of a
 	// sample output to input value
-	uint size = _size - 0x46;
-	double newSize = (double)size * (1475712.0 / 199836.0);
-	return newSize * 1000.0 / _stream->getRate();
+	uint dataSize = _size - 0x46;
+	double newSize = (double)dataSize * (1475712.0 / 199836.0);
+	return (uint)(newSize * 1000.0 / _stream->getRate());
 }
 
 bool CWaveFile::loadSound(const CString &name) {
diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index 490e6d0..5da6118 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -225,7 +225,7 @@ void CStarControlSub13::fn19(double *v1, double *v2, double *v3, double *v4) {
 }
 
 void CStarControlSub13::reset() {
-	const double FACTOR = 3.1415927 * 0.0055555557;
+	//const double FACTOR = 3.1415927 * 0.0055555557;
 	error("TODO: CStarControlSub13::reset");
 }
 
diff --git a/engines/titanic/support/transparency_surface.cpp b/engines/titanic/support/transparency_surface.cpp
index 5ffa8b9..eb3fc28 100644
--- a/engines/titanic/support/transparency_surface.cpp
+++ b/engines/titanic/support/transparency_surface.cpp
@@ -46,7 +46,7 @@ CTransparencySurface::CTransparencySurface(const Graphics::Surface *surface,
 		_flag1 = false;
 		break;
 	case TRANS_DEFAULT:
-		if (*(byte *)surface->getPixels() < 0x80) {
+		if (*(const byte *)surface->getPixels() < 0x80) {
 			_flag1 = true;
 			_flag2 = false;
 		}





More information about the Scummvm-git-logs mailing list