openttd-mini: comparison src/unmovable

equal deleted inserted replaced

-:0050610c0368
+:c291a21b304e
 #include "table/unmovable_land.h"
 /** Destroy a HQ.
 * During normal gameplay you can only implicitely destroy a HQ when you are
 * rebuilding it. Otherwise, only water can destroy it.
-* @param pid Player requesting the destruction of his HQ
+* @param cid Company requesting the destruction of his HQ
 * @param flags docommand flags of calling function
 * @return cost of the operation
 */
-static CommandCost DestroyCompanyHQ(PlayerID pid, uint32 flags)
+static CommandCost DestroyCompanyHQ(CompanyID cid, uint32 flags)
 {
-	Player *p = GetPlayer(pid);
+	Company *c = GetCompany(cid);
 	if (flags & DC_EXEC) {
-		TileIndex t = p->location_of_HQ;
+		TileIndex t = c->location_of_HQ;
 		DoClearSquare(t + TileDiffXY(0, 0));
 		DoClearSquare(t + TileDiffXY(0, 1));
 		DoClearSquare(t + TileDiffXY(1, 0));
 		DoClearSquare(t + TileDiffXY(1, 1));
-		p->location_of_HQ = 0; // reset HQ position
+		c->location_of_HQ = 0; // reset HQ position
-		InvalidateWindow(WC_COMPANY, pid);
+		InvalidateWindow(WC_COMPANY, cid);
 	}
 	/* cost of relocating company is 1% of company value */
-	return CommandCost(EXPENSES_PROPERTY, CalculateCompanyValue(p) / 100);
+	return CommandCost(EXPENSES_PROPERTY, CalculateCompanyValue(c) / 100);
 }
-void UpdateCompanyHQ(Player *p, uint score)
+void UpdateCompanyHQ(Company *c, uint score)
 {
 	byte val;
-	TileIndex tile = p->location_of_HQ;
+	TileIndex tile = c->location_of_HQ;
 	if (tile == 0) return;
 	(val = 0, score < 170) ||
 	(val++, score < 350) ||
 * @param p1 unused
 * @param p2 unused
 */
 CommandCost CmdBuildCompanyHQ(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
-	Player *p = GetPlayer(_current_player);
+	Company *c = GetCompany(_current_company);
 	CommandCost cost(EXPENSES_PROPERTY);
 	cost = CheckFlatLandBelow(tile, 2, 2, flags, 0, NULL);
 	if (CmdFailed(cost)) return cost;
-	if (p->location_of_HQ != 0) { // Moving HQ
+	if (c->location_of_HQ != 0) { // Moving HQ
-		cost.AddCost(DestroyCompanyHQ(_current_player, flags));
+		cost.AddCost(DestroyCompanyHQ(_current_company, flags));
 	}
 	if (flags & DC_EXEC) {
-		int score = UpdateCompanyRatingAndValue(p, false);
+		int score = UpdateCompanyRatingAndValue(c, false);
-		p->location_of_HQ = tile;
+		c->location_of_HQ = tile;
-		MakeCompanyHQ(tile, _current_player);
+		MakeCompanyHQ(tile, _current_company);
-		UpdateCompanyHQ(p, score);
+		UpdateCompanyHQ(c, score);
-		InvalidateWindow(WC_COMPANY, p->index);
+		InvalidateWindow(WC_COMPANY, c->index);
 	}
 	return cost;
 }
 /** Purchase a land area. Actually you only purchase one tile, so
 * the name is a bit confusing ;p
-* @param tile the tile the player is purchasing
+* @param tile the tile the company is purchasing
 * @param flags for this command type
 * @param p1 unused
 * @param p2 unused
 * @return error of cost of operation
 */
 CommandCost CmdPurchaseLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	CommandCost cost(EXPENSES_CONSTRUCTION);
-	if (IsOwnedLandTile(tile) && IsTileOwner(tile, _current_player)) {
+	if (IsOwnedLandTile(tile) && IsTileOwner(tile, _current_company)) {
 		return_cmd_error(STR_5807_YOU_ALREADY_OWN_IT);
 	}
 	cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(cost)) return CMD_ERROR;
 	if (flags & DC_EXEC) {
-		MakeOwnedLand(tile, _current_player);
+		MakeOwnedLand(tile, _current_company);
 		MarkTileDirtyByTile(tile);
 	}
 	return cost.AddCost(_price.clear_roughland * 10);
 }
 /** Sell a land area. Actually you only sell one tile, so
 * the name is a bit confusing ;p
-* @param tile the tile the player is selling
+* @param tile the tile the company is selling
 * @param flags for this command type
 * @param p1 unused
 * @param p2 unused
 * @return error or cost of operation
 */
 CommandCost CmdSellLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	if (!IsOwnedLandTile(tile)) return CMD_ERROR;
-	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER) return CMD_ERROR;
+	if (!CheckTileOwnership(tile) && _current_company != OWNER_WATER) return CMD_ERROR;
 	if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 	if (flags & DC_EXEC) DoClearSquare(tile);
 			DrawGroundSprite(SPR_CONCRETE_GROUND, PAL_NONE);
 			if (IsInvisibilitySet(TO_STRUCTURES)) break;
-			AddSortableSpriteToDraw(SPR_STATUE_COMPANY, PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)), ti->x, ti->y, 16, 16, 25, ti->z, IsTransparencySet(TO_STRUCTURES));
+			AddSortableSpriteToDraw(SPR_STATUE_COMPANY, COMPANY_SPRITE_COLOR(GetTileOwner(ti->tile)), ti->x, ti->y, 16, 16, 25, ti->z, IsTransparencySet(TO_STRUCTURES));
 			break;
 		case UNMOVABLE_OWNED_LAND:
 			DrawClearLandTile(ti, 0);
 			AddSortableSpriteToDraw(
-				SPR_BOUGHT_LAND, PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)),
+				SPR_BOUGHT_LAND, COMPANY_SPRITE_COLOR(GetTileOwner(ti->tile)),
 				ti->x + TILE_SIZE / 2, ti->y + TILE_SIZE / 2, 1, 1, BB_HEIGHT_UNDER_BRIDGE, GetSlopeZ(ti->x + TILE_SIZE / 2, ti->y + TILE_SIZE / 2)
 			);
 			DrawBridgeMiddle(ti);
 			break;
 		default: {
 			assert(IsCompanyHQ(ti->tile));
 			if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED);
-			SpriteID palette = PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile));
+			SpriteID palette = COMPANY_SPRITE_COLOR(GetTileOwner(ti->tile));
 			const DrawTileSprites *t = &_unmovable_display_datas[GetCompanyHQSection(ti->tile)];
 			DrawGroundSprite(t->ground.sprite, palette);
 			if (IsInvisibilitySet(TO_STRUCTURES)) break;
 }
 static CommandCost ClearTile_Unmovable(TileIndex tile, byte flags)
 {
 	if (IsCompanyHQ(tile)) {
-		if (_current_player == OWNER_WATER) {
+		if (_current_company == OWNER_WATER) {
 			return DestroyCompanyHQ(GetTileOwner(tile), DC_EXEC);
 		} else {
 			return_cmd_error(STR_5804_COMPANY_HEADQUARTERS_IN);
 		}
 	}
 	if (IsOwnedLand(tile)) {
 		return DoCommand(tile, 0, 0, flags, CMD_SELL_LAND_AREA);
 	}
 	/* checks if you're allowed to remove unmovable things */
-	if (_game_mode != GM_EDITOR && _current_player != OWNER_WATER && ((flags & DC_AUTO || !_cheats.magic_bulldozer.value)) )
+	if (_game_mode != GM_EDITOR && _current_company != OWNER_WATER && ((flags & DC_AUTO || !_cheats.magic_bulldozer.value)) )
 		return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);
 	if (IsStatue(tile)) {
 		if (flags & DC_AUTO) return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);
 	return 0;
 }
 static void ClickTile_Unmovable(TileIndex tile)
 {
-	if (IsCompanyHQ(tile)) ShowPlayerCompany(GetTileOwner(tile));
+	if (IsCompanyHQ(tile)) ShowCompany(GetTileOwner(tile));
 }
 /* checks, if a radio tower is within a 9x9 tile square around tile */
 static bool IsRadioTowerNearby(TileIndex tile)
 			tile = TILE_MASK(tile + TileOffsByDiagDir(dir));
 		}
 	}
 }
-static void ChangeTileOwner_Unmovable(TileIndex tile, PlayerID old_player, PlayerID new_player)
+static void ChangeTileOwner_Unmovable(TileIndex tile, Owner old_owner, Owner new_owner)
 {
-	if (!IsTileOwner(tile, old_player)) return;
+	if (!IsTileOwner(tile, old_owner)) return;
-	if (IsOwnedLand(tile) && new_player != PLAYER_SPECTATOR) {
+	if (IsOwnedLand(tile) && new_owner != INVALID_OWNER) {
-		SetTileOwner(tile, new_player);
+		SetTileOwner(tile, new_owner);
 	} else if (IsStatueTile(tile)) {
 		TownID town = GetStatueTownID(tile);
 		Town *t = GetTown(town);
-		ClrBit(t->statues, old_player);
+		ClrBit(t->statues, old_owner);
-		if (new_player != PLAYER_SPECTATOR && !HasBit(t->statues, new_player)) {
+		if (new_owner != INVALID_OWNER && !HasBit(t->statues, new_owner)) {
 			/* Transfer ownership to the new company */
-			SetBit(t->statues, new_player);
+			SetBit(t->statues, new_owner);
-			SetTileOwner(tile, new_player);
+			SetTileOwner(tile, new_owner);
 		} else {
 			DoClearSquare(tile);
 		}
 		InvalidateWindow(WC_TOWN_AUTHORITY, town);

changeset 10207	c291a21b304e
parent 10010	09ff8bd74b87
child 10208	72c00af5c95d