[Scummvm-git-logs] scummvm master -> cb55775f608aae8df8b27ca73d8a54c539dae7f2

[digitall]

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:
cb55775f60 STARTREK: Fix Various Compiler Warnings.


Commit: cb55775f608aae8df8b27ca73d8a54c539dae7f2
    https://github.com/scummvm/scummvm/commit/cb55775f608aae8df8b27ca73d8a54c539dae7f2
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T15:08:24+01:00

Commit Message:
STARTREK: Fix Various Compiler Warnings.

Changed paths:
    engines/startrek/fixedint.h
    engines/startrek/space.h


diff --git a/engines/startrek/fixedint.h b/engines/startrek/fixedint.h
index 605f166..babed24 100644
--- a/engines/startrek/fixedint.h
+++ b/engines/startrek/fixedint.h
@@ -34,8 +34,8 @@ namespace StarTrek {
  */
 template<typename T, uint totalBits, uint decimalBits>
 class TFixedInt : Common::Serializable {
-	const static int max = (1 << (totalBits - decimalBits - 1)) - 1;
-	const static int min = -max - 1;
+	static const int max = (1 << (totalBits - decimalBits - 1)) - 1;
+	static const int min = -max - 1;
 
 	T val;
 
diff --git a/engines/startrek/space.h b/engines/startrek/space.h
index d980d23..a3d4641 100644
--- a/engines/startrek/space.h
+++ b/engines/startrek/space.h
@@ -73,7 +73,10 @@ struct TPoint {
 			return y;
 		else if (i == 2)
 			return z;
+
+		// Unknown Out of Range
 		assert(false);
+		return x;
 	}
 	T operator[](int i) const {
 		if (i == 0)
@@ -82,7 +85,10 @@ struct TPoint {
 			return y;
 		else if (i == 2)
 			return z;
+
+		// Unknown Out of Range
 		assert(false);
+		return x;
 	}
 };