diff --git a/lib/GameConstants.h b/lib/GameConstants.h index d9265ffbf..b8f205262 100644 --- a/lib/GameConstants.h +++ b/lib/GameConstants.h @@ -250,8 +250,8 @@ public: } bool operator == (const Identifier & b) const { return num == b.num; } - bool operator <= (const Identifier & b) const { return num >= b.num; } - bool operator >= (const Identifier & b) const { return num <= b.num; } + bool operator <= (const Identifier & b) const { return num <= b.num; } + bool operator >= (const Identifier & b) const { return num >= b.num; } bool operator != (const Identifier & b) const { return num != b.num; } bool operator < (const Identifier & b) const { return num < b.num; } bool operator > (const Identifier & b) const { return num > b.num; } diff --git a/lib/rmg/Functions.cpp b/lib/rmg/Functions.cpp index f1600ec68..c1b12fcee 100644 --- a/lib/rmg/Functions.cpp +++ b/lib/rmg/Functions.cpp @@ -134,7 +134,7 @@ void initTerrainType(Zone & zone, CMapGenerator & gen) if (terrainType <= ETerrainId::NONE) { - logGlobal->warn("Town %s has invalid terrain type: %s", zone.getTownType(), terrainType); + logGlobal->warn("Town %s has invalid terrain type: %d", zone.getTownType(), terrainType); zone.setTerrainType(ETerrainId::DIRT); } else