cpp/openttd-patchpack/source Changeset - r8651:5d96f8177b3e

Changeset - r8651:5d96f8177b3e

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

glx - 16 years ago 2008-02-28 00:10:08
glx@openttd.org

(svn r12303) -Codechange: move IsValidTile() in a more suitable place and make it static inline

3 files changed with 19 insertions and 17 deletions:

src/landscape.cpp

src/landscape.h

src/tile_map.h

0 comments (0 inline, 0 general)

src/landscape.cpp

➞

Show inline comments

@@ @@ -919,8 +919,3 @@ TileIndex AdjustTileCoordRandomly(TileIn @@
 		TileY(a) + (GB(r, 8, 8) * rn * 2 >> 8) - rn
 	));
+}
 bool IsValidTile(TileIndex tile)
+{
 	return (tile < MapSizeX() * MapMaxY() && TileX(tile) != MapMaxX());
+}

src/landscape.h

➞

Show inline comments

@@ @@ -26,8 +26,6 @@ byte GetSnowLine(void); @@
 byte HighestSnowLine(void);
 void ClearSnowLine(void);
 bool IsValidTile(TileIndex tile);
 uint GetPartialZ(int x, int y, Slope corners);
 uint GetSlopeZ(int x, int y);
 void GetSlopeZOnEdge(Slope tileh, DiagDirection edge, int *z1, int *z2);

src/tile_map.h

➞

Show inline comments

@@ @@ -107,6 +107,17 @@ static inline bool IsTileType(TileIndex @@
+}
 /**
  * Checks if a tile is valid
+ *
  * @param tile The tile to check
  * @return True if the tile is on the map and not one of MP_VOID.
  */
 static inline bool IsValidTile(TileIndex tile)
+{
 	return tile < MapSize() && !IsTileType(tile, MP_VOID);
+}
 /**
  * Returns the owner of a tile
+ *
  * This function returns the owner of a tile. This cannot used
@@ @@ -115,14 +126,13 @@ static inline bool IsTileType(TileIndex @@
+ *
  * @param tile The tile to check
  * @return The owner of the tile
  * @pre tile < MapSize()
  * @pre The type of the tile must not be MP_HOUSE, MP_VOID and MP_INDUSTRY
  * @pre IsValidTile(tile)
  * @pre The type of the tile must not be MP_HOUSE and MP_INDUSTRY
  */
 static inline Owner GetTileOwner(TileIndex tile)
+{
-	assert(tile < MapSize());
+	assert(IsValidTile(tile));
 	assert(!IsTileType(tile, MP_HOUSE));
 	assert(!IsTileType(tile, MP_VOID));
 	assert(!IsTileType(tile, MP_INDUSTRY));
 	return (Owner)_m[tile].m1;
@@ @@ -136,14 +146,13 @@ static inline Owner GetTileOwner(TileInd @@
+ *
  * @param tile The tile to change the owner status.
  * @param owner The new owner.
  * @pre tile < MapSize()
  * @pre The type of the tile must not be MP_HOUSE, MP_VOID and MP_INDUSTRY
  * @pre IsValidTile(tile)
  * @pre The type of the tile must not be MP_HOUSE and MP_INDUSTRY
  */
 static inline void SetTileOwner(TileIndex tile, Owner owner)
+{
-	assert(tile < MapSize());
+	assert(IsValidTile(tile));
 	assert(!IsTileType(tile, MP_HOUSE));
 	assert(!IsTileType(tile, MP_VOID));
 	assert(!IsTileType(tile, MP_INDUSTRY));
 	_m[tile].m1 = owner;
@@ @@ -165,7 +174,7 @@ static inline bool IsTileOwner(TileIndex @@
  * Set the tropic zone
  * @param tile the tile to set the zone of
  * @param type the new type
- * @pre assert(tile < MapSize());
  * @pre tile < MapSize()
  */
 static inline void SetTropicZone(TileIndex tile, TropicZone type)
+{
@@ @@ -176,7 +185,7 @@ static inline void SetTropicZone(TileInd @@
 /**
  * Get the tropic zone
  * @param tile the tile to get the zone of
- * @pre assert(tile < MapSize());
  * @pre tile < MapSize()
  * @return the zone type
  */
 static inline TropicZone GetTropicZone(TileIndex tile)

0 comments (0 inline, 0 general)