[Scummvm-git-logs] scummvm master -> 674094016a12b688759da919f8f87c9975bfddb5

[ccawley2011]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d1488f46de SAGA: Fix compilation with C++98 compilers
a3f9cd878f COMMON: Fix warnings with older compilers
674094016a AUDIO: Fix missing include


Commit: d1488f46dea49e0737b20c80949e84898e4a101e
    https://github.com/scummvm/scummvm/commit/d1488f46dea49e0737b20c80949e84898e4a101e
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-07-09T17:09:00+01:00

Commit Message:
SAGA: Fix compilation with C++98 compilers

Changed paths:
    engines/saga/music.cpp


diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 270bd2812f..871d4689fa 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -78,7 +78,7 @@ Music::Music(SagaEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer), _par
 					error("Could not find AdLib instrument definition files %s and %s", opl2InstDefFilename, opl3InstDefFilename);
 				}
 			} else {
-				_driver = new MidiDriver_ADLIB_Multisource(OPL::Config::OplType::kOpl3);
+				_driver = new MidiDriver_ADLIB_Multisource(OPL::Config::kOpl3);
 			}
 			break;
 		case MT_MT32:


Commit: a3f9cd878fa5de73d2fc85f1f91e2d0428beda81
    https://github.com/scummvm/scummvm/commit/a3f9cd878fa5de73d2fc85f1f91e2d0428beda81
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-07-09T17:09:21+01:00

Commit Message:
COMMON: Fix warnings with older compilers

Changed paths:
    common/rect.h


diff --git a/common/rect.h b/common/rect.h
index 96437d752f..82e5c9efd3 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -80,11 +80,11 @@ struct Point {
 	/**
 	 * Create a point by dividing a point by the (double) @p divisor value.
 	 */
-	Point operator/(double divisor) const { return Point(x / divisor, y / divisor); }
+	Point operator/(double divisor) const { return Point((int16)(x / divisor), (int16)(y / divisor)); }
 	/**
 	 * Create a point by multiplying a point by the (double) @p multiplier value.
 	 */
-	Point operator*(double multiplier) const { return Point(x * multiplier, y * multiplier); }
+	Point operator*(double multiplier) const { return Point((int16)(x * multiplier), (int16)(y * multiplier)); }
 
 	/**
 	 * Change a point's position by adding @p delta to its x and y coordinates.
@@ -122,7 +122,7 @@ struct Point {
 };
 
 static inline Point operator*(int multiplier, const Point &p) { return Point(p.x * multiplier, p.y * multiplier); }
-static inline Point operator*(double multiplier, const Point &p) { return Point(p.x * multiplier, p.y * multiplier); }
+static inline Point operator*(double multiplier, const Point &p) { return Point((int16)(p.x * multiplier), (int16)(p.y * multiplier)); }
 
 /**
  * Simple class for handling a rectangular zone.


Commit: 674094016a12b688759da919f8f87c9975bfddb5
    https://github.com/scummvm/scummvm/commit/674094016a12b688759da919f8f87c9975bfddb5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-07-09T17:09:32+01:00

Commit Message:
AUDIO: Fix missing include

Changed paths:
    audio/softsynth/sid.h


diff --git a/audio/softsynth/sid.h b/audio/softsynth/sid.h
index d07d25bc47..87bdb15c31 100644
--- a/audio/softsynth/sid.h
+++ b/audio/softsynth/sid.h
@@ -28,6 +28,8 @@
 #ifndef AUDIO_SOFTSYNTH_SID_H
 #define AUDIO_SOFTSYNTH_SID_H
 
+#include "common/scummsys.h"
+
 // Inlining on/off.
 #define RESID_INLINE inline