diff options
| author | D G Turner | 2018-08-09 15:08:24 +0100 |
|---|---|---|
| committer | D G Turner | 2018-08-09 15:08:24 +0100 |
| commit | cb55775f608aae8df8b27ca73d8a54c539dae7f2 (patch) | |
| tree | 969eb8cf26380f522636ad8ed76a630a371fbe44 | |
| parent | 7e4faf2111ca7e563e550958c8ab4adc17513766 (diff) | |
| download | scummvm-rg350-cb55775f608aae8df8b27ca73d8a54c539dae7f2.tar.gz scummvm-rg350-cb55775f608aae8df8b27ca73d8a54c539dae7f2.tar.bz2 scummvm-rg350-cb55775f608aae8df8b27ca73d8a54c539dae7f2.zip | |
STARTREK: Fix Various Compiler Warnings.
| -rw-r--r-- | engines/startrek/fixedint.h | 4 | ||||
| -rw-r--r-- | engines/startrek/space.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/startrek/fixedint.h b/engines/startrek/fixedint.h index 605f166326..babed24458 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 d980d23c1d..a3d4641fe8 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; } }; |