diff options
| author | smatz <smatz@openttd.org> | 2008-11-23 16:45:53 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-11-23 16:45:53 +0000 |
| commit | bad455f327226dcd0888392714f75eea592b466d (patch) | |
| tree | e479f1e64af9b12409e169e94724aff6d723fe04 | |
| parent | aaf21df68bf49072e13866eb62701ef8050dafc7 (diff) | |
| download | openttd-bad455f327226dcd0888392714f75eea592b466d.tar.xz | |
(svn r14614) -Codechange [FS#2423]: GetTreeCount() should behave as its name and documentation imply. Remove unused SetTreeCount() (PhilSophus)
| -rw-r--r-- | src/tree_cmd.cpp | 10 | ||||
| -rw-r--r-- | src/tree_map.h | 17 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index bedd9573a..cbd28e6da 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -350,7 +350,7 @@ CommandCost CmdPlantTree(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) switch (GetTileType(tile)) { case MP_TREES: /* no more space for trees? */ - if (_game_mode != GM_EDITOR && GetTreeCount(tile) == 3) { + if (_game_mode != GM_EDITOR && GetTreeCount(tile) == 4) { msg = STR_2803_TREE_ALREADY_HERE; continue; } @@ -478,7 +478,7 @@ static void DrawTile_Trees(TileInfo *ti) TreeListEnt te[4]; /* put the trees to draw in a list */ - uint trees = GetTreeCount(ti->tile) + 1; + uint trees = GetTreeCount(ti->tile); for (uint i = 0; i < trees; i++) { SpriteID image = s[0].sprite + (i == trees - 1 ? GetTreeGrowth(ti->tile) : 3); @@ -538,7 +538,7 @@ static CommandCost ClearTile_Trees(TileIndex tile, byte flags) if (t != NULL) ChangeTownRating(t, RATING_TREE_DOWN_STEP, RATING_TREE_MINIMUM); } - num = GetTreeCount(tile) + 1; + num = GetTreeCount(tile); if (IsInsideMM(GetTreeType(tile), TREE_RAINFOREST, TREE_CACTUS)) num *= 4; if (flags & DC_EXEC) DoClearSquare(tile); @@ -664,7 +664,7 @@ static void TileLoop_Trees(TileIndex tile) break; case 1: /* add a tree */ - if (GetTreeCount(tile) < 3) { + if (GetTreeCount(tile) < 4) { AddTreeCount(tile, 1); SetTreeGrowth(tile, 0); break; @@ -694,7 +694,7 @@ static void TileLoop_Trees(TileIndex tile) break; case 6: /* final stage of tree destruction */ - if (GetTreeCount(tile) > 0) { + if (GetTreeCount(tile) > 1) { /* more than one tree, delete it */ AddTreeCount(tile, -1); SetTreeGrowth(tile, 3); diff --git a/src/tree_map.h b/src/tree_map.h index fd3d60194..f63c53f2f 100644 --- a/src/tree_map.h +++ b/src/tree_map.h @@ -144,7 +144,7 @@ static inline void SetTreeGroundDensity(TileIndex t, TreeGround g, uint d) static inline uint GetTreeCount(TileIndex t) { assert(IsTileType(t, MP_TREES)); - return GB(_m[t].m5, 6, 2); + return GB(_m[t].m5, 6, 2) + 1; } /** @@ -165,21 +165,6 @@ static inline void AddTreeCount(TileIndex t, int c) } /** - * Sets the tree amount of a tile. - * - * This function directly sets the amount of trees of a tile. - * - * @param t The tile to set the amount of trees - * @param c The number of trees - * @pre Tile must be of type MP_TREES - */ -static inline void SetTreeCount(TileIndex t, uint c) -{ - assert(IsTileType(t, MP_TREES)); // XXX incomplete - SB(_m[t].m5, 6, 2, c); -} - -/** * Returns the tree growth status. * * This function returns the tree growth status of a tile with trees. |