diff --git a/src/common/engine/palettecontainer.cpp b/src/common/engine/palettecontainer.cpp index 9648f2528..800dc31c6 100644 --- a/src/common/engine/palettecontainer.cpp +++ b/src/common/engine/palettecontainer.cpp @@ -367,7 +367,7 @@ static bool IndexOutOfRange(const int start1, const int end1, const int start2, // //---------------------------------------------------------------------------- -bool FRemapTable::operator==(const FRemapTable& o) +bool FRemapTable::operator==(const FRemapTable& o) const { // Two translations are identical when they have the same amount of colors // and the palette values for both are identical. diff --git a/src/common/engine/palettecontainer.h b/src/common/engine/palettecontainer.h index e1d0befd3..a220873a6 100644 --- a/src/common/engine/palettecontainer.h +++ b/src/common/engine/palettecontainer.h @@ -19,7 +19,7 @@ struct FRemapTable FRemapTable(const FRemapTable& o) = default; FRemapTable& operator=(const FRemapTable& o) = default; - bool operator==(const FRemapTable& o); + bool operator==(const FRemapTable& o) const; void MakeIdentity(); bool IsIdentity() const; bool AddIndexRange(int start, int end, int pal1, int pal2); diff --git a/src/common/utility/vectors.h b/src/common/utility/vectors.h index 140c310f0..f392f561f 100644 --- a/src/common/utility/vectors.h +++ b/src/common/utility/vectors.h @@ -561,7 +561,7 @@ struct TVector3 void GetRightUp(TVector3 &right, TVector3 &up) { TVector3 n(X, Y, Z); - TVector3 fn(fabs(n.X), fabs(n.Y), fabs(n.Z)); + TVector3 fn((vec_t)fabs(n.X), (vec_t)fabs(n.Y), (vec_t)fabs(n.Z)); int major = 0; if (fn[1] > fn[major]) major = 1; diff --git a/src/console/c_cmds.cpp b/src/console/c_cmds.cpp index f48dcfa82..6e21cfcc2 100644 --- a/src/console/c_cmds.cpp +++ b/src/console/c_cmds.cpp @@ -425,7 +425,7 @@ CCMD (changeskill) if (argv.argc() == 2) { int skill = atoi(argv[1]); - if (skill < 0 || skill >= AllSkills.Size()) + if ((unsigned)skill >= AllSkills.Size()) { Printf ("Skill %d is out of range.\n", skill); }