cpp/openttd-patchpack/source Changeset - r10816:2ed0dff886de

Changeset - r10816:2ed0dff886de

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Yexo - 15 years ago 2009-01-19 15:06:11
yexo@openttd.org

(svn r15151) -Fix: tile 0 can now be highlighted as error tile

4 files changed with 7 insertions and 7 deletions:

src/misc.cpp

src/misc_gui.cpp

src/terraform_cmd.cpp

src/viewport.cpp

0 comments (0 inline, 0 general)

src/misc.cpp

➞

Show inline comments

@@ @@ -70,6 +70,7 @@ void InitializeGame(uint size_x, uint si @@
 	_realtime_tick = 0;
 	_date_fract = 0;
 	_cur_tileloop_tile = 0;
 	_thd.redsq = INVALID_TILE;
 	MakeNewgameSettingsLive();
 	if (reset_date) {

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -505,7 +505,7 @@ public: @@
 	~ErrmsgWindow()
+	{
-		SetRedErrorSquare(0);
+		SetRedErrorSquare(INVALID_TILE);
 		extern StringID _switch_mode_errorstr;
 		_switch_mode_errorstr = INVALID_STRING_ID;
+	}

src/terraform_cmd.cpp

➞

Show inline comments

@@ @@ -165,10 +165,9 @@ static CommandCost TerraformTileHeight(T @@
 	if ((x <= 1) || (y <= 1) || (x >= MapMaxX() - 1) || (y >= MapMaxY() - 1)) {
 		/*
 		 * Determine a sensible error tile
 		 * Note: If x and y are both zero this will disable the error tile. (Tile 0 cannot be highlighted :( )
 		 */
 		if ((x == 1) && (y != 0)) x = 0;
 		if ((y == 1) && (x != 0)) y = 0;
 		if (x == 1) x = 0;
 		if (y == 1) y = 0;
 		_terraform_err_tile = TileXY(x, y);
 		return_cmd_error(STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP);
+	}

src/viewport.cpp

➞

Show inline comments

@@ @@ -878,7 +878,7 @@ static void DrawAutorailSelection(const @@
 static void DrawTileSelection(const TileInfo *ti)
+{
 	/* Draw a red error square? */
-	bool is_redsq = _thd.redsq != 0 && _thd.redsq == ti->tile;
 	bool is_redsq = _thd.redsq == ti->tile;
 	if (is_redsq) DrawTileSelectionRect(ti, PALETTE_TILE_RED_PULSATING);
 	/* no selection active? */
@@ @@ -2085,8 +2085,8 @@ void SetRedErrorSquare(TileIndex tile) @@
 	_thd.redsq = tile;
 	if (tile != old) {
 		if (tile != 0) MarkTileDirtyByTile(tile);
 		if (old  != 0) MarkTileDirtyByTile(old);
 		if (tile != INVALID_TILE) MarkTileDirtyByTile(tile);
 		if (old  != INVALID_TILE) MarkTileDirtyByTile(old);
+	}
+}

0 comments (0 inline, 0 general)