cpp/openttd-patchpack/source Changeset - r1791:cb107a498313

Changeset - r1791:cb107a498313

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Darkvater - 19 years ago 2005-05-11 16:29:33
darkvater@openttd.org

(svn r2295) - Fix: you were still able to delete any tile if you were not careful with CmdDestroyCompanyHQ. Fixed this; thanks HackyKid.

1 file changed with 9 insertions and 6 deletions:

unmovable_cmd.c

0 comments (0 inline, 0 general)

unmovable_cmd.c

➞

Show inline comments

@@ @@ -366,13 +366,14 @@ int32 CmdBuildCompanyHQ(int x, int y, ui @@
  */
 int32 CmdDestroyCompanyHQ(int x, int y, uint32 flags, uint32 p1, uint32 p2)
+{
-	TileIndex tile = TILE_FROM_XY(x,y);
 	TileIndex tile;
 	Player *p;
 	SET_EXPENSES_TYPE(EXPENSES_PROPERTY);
 	/* Find player that has HQ flooded, and reset their location_of_house */
 	if (_current_player == OWNER_WATER)	{
 		tile = TILE_FROM_XY(x,y);
 		bool dodelete = false;
 		FOR_ALL_PLAYERS(p) {
 			if (p->location_of_house == tile) {
@@ @@ -381,15 +382,17 @@ int32 CmdDestroyCompanyHQ(int x, int y, @@
+			}
+		}
 		if (!dodelete) return CMD_ERROR;
-	} else  /* Destruction was initiated by player */
 	} else /* Destruction was initiated by player */
 		p = DEREF_PLAYER(_current_player);
 	if (p->location_of_house == 0) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		DoClearSquare(p->location_of_house + TILE_XY(0,0));
 		DoClearSquare(p->location_of_house + TILE_XY(0,1));
 		DoClearSquare(p->location_of_house + TILE_XY(1,0));
 		DoClearSquare(p->location_of_house + TILE_XY(1,1));
 		p->location_of_house = 0; // reset HQ position
 		DoClearSquare(tile + TILE_XY(0,0));
 		DoClearSquare(tile + TILE_XY(0,1));
 		DoClearSquare(tile + TILE_XY(1,0));
 		DoClearSquare(tile + TILE_XY(1,1));
 		InvalidateWindow(WC_COMPANY, (int)p->index);
+	}

0 comments (0 inline, 0 general)