diff options
| author | Paul Gilbert | 2016-10-30 15:00:16 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-10-30 15:00:16 -0400 |
| commit | 1ff861ed3f4cb591e7d19b79b40a49d662a32755 (patch) | |
| tree | e881222ba143c1fb40262259cec5958ac23c9a4b | |
| parent | f04174aa8a0c871dbb2a5523d747ec11d65c036c (diff) | |
| download | scummvm-rg350-1ff861ed3f4cb591e7d19b79b40a49d662a32755.tar.gz scummvm-rg350-1ff861ed3f4cb591e7d19b79b40a49d662a32755.tar.bz2 scummvm-rg350-1ff861ed3f4cb591e7d19b79b40a49d662a32755.zip | |
TITANIC: Fix somer compiler warnings
| -rw-r--r-- | engines/titanic/sound/wave_file.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control_sub13.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/transparency_surface.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp index ade94aad50..2c583f2160 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 490e6d0630..5da6118a74 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 5ffa8b99b1..eb3fc28b52 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; } |