cpp/openttd-patchpack/source Changeset - r20809:bac204b8150a

Changeset - r20809:bac204b8150a

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

zuu - 11 years ago 2013-10-12 22:28:38
zuu@openttd.org

(svn r25853) -Codechange: Simplify SetupFarmFieldFence by replacing the Axis and north parameter with a direction parameter and taking adventage of the new unified SetFence function (cirdan, LordAro)

1 file changed with 16 insertions and 19 deletions:

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -956,8 +956,17 @@ static bool IsSuitableForFarmField(TileI @@
+	}
+}
 static void SetupFarmFieldFence(TileIndex tile, int size, byte type, Axis direction, bool north)
 /**
  * Build farm field fence
  * @param tile the tile to position the fence on
  * @param size the size of the field being planted in tiles
  * @param type type of fence to set
  * @param side the side of the tile to attempt placement
  */
 static void SetupFarmFieldFence(TileIndex tile, int size, byte type, DiagDirection side)
+{
 	TileIndexDiff diff = (DiagDirToAxis(side) == AXIS_Y ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
 	do {
 		tile = TILE_MASK(tile);
@@ @@ -966,22 +975,10 @@ static void SetupFarmFieldFence(TileInde @@
 			if (or_ == 1 && Chance16(1, 7)) or_ = 2;
 			if (direction == AXIS_X) {
 				if (north) {
 					SetFence(tile, DIAGDIR_NW, or_);
 				} else {
 					SetFence(tile, DIAGDIR_SE, or_);
+				}
 			} else {
 				if (north) {
 					SetFence(tile, DIAGDIR_NE, or_);
 				} else {
 					SetFence(tile, DIAGDIR_SW, or_);
+				}
+			}
 			SetFence(tile, side, or_);
+		}
-		tile += (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
+		tile += diff;
 	} while (--size);
+}
@@ @@ -1030,10 +1027,10 @@ static void PlantFarmField(TileIndex til @@
 		type = _plantfarmfield_type[Random() & 0xF];
+	}
 	SetupFarmFieldFence(ta.tile, ta.h, type, AXIS_Y, true);
 	SetupFarmFieldFence(ta.tile, ta.w, type, AXIS_X, true);
 	SetupFarmFieldFence(ta.tile + TileDiffXY(ta.w - 1, 0), ta.h, type, AXIS_Y, false);
 	SetupFarmFieldFence(ta.tile + TileDiffXY(0, ta.h - 1), ta.w, type, AXIS_X, false);
 	SetupFarmFieldFence(ta.tile, ta.h, type, DIAGDIR_NE);
 	SetupFarmFieldFence(ta.tile, ta.w, type, DIAGDIR_NW);
 	SetupFarmFieldFence(ta.tile + TileDiffXY(ta.w - 1, 0), ta.h, type, DIAGDIR_SW);
 	SetupFarmFieldFence(ta.tile + TileDiffXY(0, ta.h - 1), ta.w, type, DIAGDIR_SE);
+}
 void PlantRandomFarmField(const Industry *i)

0 comments (0 inline, 0 general)