cpp/openttd-patchpack/source Changeset - r10363:2000eaad8f5e

Changeset - r10363:2000eaad8f5e

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 16 years ago 2008-11-23 16:45:53
smatz@openttd.org

(svn r14614) -Codechange [FS#2423]: GetTreeCount() should behave as its name and documentation imply. Remove unused SetTreeCount() (PhilSophus)

2 files changed with 6 insertions and 21 deletions:

src/tree_cmd.cpp

src/tree_map.h

0 comments (0 inline, 0 general)

src/tree_cmd.cpp

➞

Show inline comments

@@ @@ -350,7 +350,7 @@ CommandCost CmdPlantTree(TileIndex tile, @@
 			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(TileI @@
 		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 til @@
 						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 til @@
 			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);

src/tree_map.h

➞

Show inline comments

@@ @@ -144,7 +144,7 @@ static inline void SetTreeGroundDensity( @@
 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(TileInde @@
+}
 /**
  * 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.

0 comments (0 inline, 0 general)