--- a/unmovable_cmd.c	Fri Jun 23 22:05:40 2006 +0000
+++ b/unmovable_cmd.c	Sat Jun 24 08:08:28 2006 +0000
@@ -25,39 +25,25 @@
  * @param tile tile coordinates where HQ is located to destroy
  * @param flags docommand flags of calling function
  */
-static int32 DestroyCompanyHQ(TileIndex tile, uint32 flags)
+static int32 DestroyCompanyHQ(PlayerID pid, uint32 flags)
 {
-	Player *p;
+	Player* p = GetPlayer(pid);
 
 	SET_EXPENSES_TYPE(EXPENSES_PROPERTY);
 
-	/* Find player that has HQ flooded, and reset their location_of_house */
-	if (_current_player == OWNER_WATER) {
-		bool dodelete = false;
+	if (flags & DC_EXEC) {
+		TileIndex t = p->location_of_house;
 
-		FOR_ALL_PLAYERS(p) {
-			if (p->location_of_house == tile) {
-				dodelete = true;
-				break;
-			}
-		}
-		if (!dodelete) return CMD_ERROR;
-	} else /* Destruction was initiated by player */
-		p = GetPlayer(_current_player);
-
-		if (p->location_of_house == 0) return CMD_ERROR;
-
-		if (flags & DC_EXEC) {
-			DoClearSquare(p->location_of_house + TileDiffXY(0, 0));
-			DoClearSquare(p->location_of_house + TileDiffXY(0, 1));
-			DoClearSquare(p->location_of_house + TileDiffXY(1, 0));
-			DoClearSquare(p->location_of_house + TileDiffXY(1, 1));
-			p->location_of_house = 0; // reset HQ position
-			InvalidateWindow(WC_COMPANY, p->index);
-		}
+		DoClearSquare(t + TileDiffXY(0, 0));
+		DoClearSquare(t + TileDiffXY(0, 1));
+		DoClearSquare(t + TileDiffXY(1, 0));
+		DoClearSquare(t + TileDiffXY(1, 1));
+		p->location_of_house = 0; // reset HQ position
+		InvalidateWindow(WC_COMPANY, pid);
+	}
 
 	// cost of relocating company is 1% of company value
-		return CalculateCompanyValue(p) / 100;
+	return CalculateCompanyValue(p) / 100;
 }
 
 void UpdateCompanyHQ(Player *p, uint score)
@@ -101,9 +87,7 @@
 	cost = ret;
 
 	if (p->location_of_house != 0) { /* Moving HQ */
-		ret = DestroyCompanyHQ(p->location_of_house, flags);
-		if (CmdFailed(ret)) return CMD_ERROR;
-		cost += ret;
+		cost += DestroyCompanyHQ(_current_player, flags);
 	}
 
 	if (flags & DC_EXEC) {
@@ -202,8 +186,11 @@
 static int32 ClearTile_Unmovable(TileIndex tile, byte flags)
 {
 	if (IsCompanyHQ(tile)) {
-		if (_current_player == OWNER_WATER) return DestroyCompanyHQ(tile, DC_EXEC);
-		return_cmd_error(STR_5804_COMPANY_HEADQUARTERS_IN);
+		if (_current_player == OWNER_WATER) {
+			return DestroyCompanyHQ(GetTileOwner(tile), DC_EXEC);
+		} else {
+			return_cmd_error(STR_5804_COMPANY_HEADQUARTERS_IN);
+		}
 	}
 
 	if (IsOwnedLand(tile)) {