games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

move CMap::isInTheMap to the header file and make it inline

Browse Source
This commit is contained in:
K
2024-08-22 14:27:01 +02:00
parent 3a27725fcb
commit 18a69dfeb5
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapping/CMap.cpp
View File

@@ -332,15 +332,6 @@ bool CMap::isCoastalTile(const int3 & pos) const
return false; return false;
} }
bool CMap::isInTheMap(const int3 & pos) const
{
// Check whether coord < 0 is done implicitly. Negative signed int overflows to unsigned number larger than all signed ints.
return
static_cast<uint32_t>(pos.x) < static_cast<uint32_t>(width) &&
static_cast<uint32_t>(pos.y) < static_cast<uint32_t>(height) &&
static_cast<uint32_t>(pos.z) <= (twoLevel ? 1 : 0);
}
TerrainTile & CMap::getTile(const int3 & tile) TerrainTile & CMap::getTile(const int3 & tile)
{ {
assert(isInTheMap(tile)); assert(isInTheMap(tile));

9
lib/mapping/CMap.h
View File

@@ -84,8 +84,15 @@ public:
TerrainTile & getTile(const int3 & tile); TerrainTile & getTile(const int3 & tile);
const TerrainTile & getTile(const int3 & tile) const; const TerrainTile & getTile(const int3 & tile) const;
bool isCoastalTile(const int3 & pos) const; bool isCoastalTile(const int3 & pos) const;
bool isInTheMap(const int3 & pos) const;
bool isWaterTile(const int3 & pos) const; bool isWaterTile(const int3 & pos) const;
inline bool isInTheMap(const int3 & pos) const
{
// Check whether coord < 0 is done implicitly. Negative signed int overflows to unsigned number larger than all signed ints.
return
static_cast<uint32_t>(pos.x) < static_cast<uint32_t>(width) &&
static_cast<uint32_t>(pos.y) < static_cast<uint32_t>(height) &&
static_cast<uint32_t>(pos.z) <= (twoLevel ? 1 : 0);
}
bool canMoveBetween(const int3 &src, const int3 &dst) const; bool canMoveBetween(const int3 &src, const int3 &dst) const;
bool checkForVisitableDir(const int3 & src, const TerrainTile * pom, const int3 & dst) const; bool checkForVisitableDir(const int3 & src, const TerrainTile * pom, const int3 & dst) const;