mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1729) - Fix: [ 1112469 ] Clearing land for free by reallocating HQ

release/0.4.5
darkvater 2005-01-30 14:32:52 +00:00
parent e8f4b7cf19
commit 961ba55e85
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unmovable_cmd.c
View File

@ -314,21 +314,29 @@ extern int32 CheckFlatLandBelow(uint tile, uint w, uint h, uint flags, uint inva
*/ */
int32 CmdBuildCompanyHQ(int x, int y, uint32 flags, uint32 p1, uint32 p2) int32 CmdBuildCompanyHQ(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{ {
uint tile = TILE_FROM_XY(x,y); TileIndex tile = TILE_FROM_XY(x,y);
Player *p = DEREF_PLAYER(_current_player); Player *p = DEREF_PLAYER(_current_player);
int score; int score;
int32 cost = 0; int32 cost = 0;
SET_EXPENSES_TYPE(EXPENSES_PROPERTY); SET_EXPENSES_TYPE(EXPENSES_PROPERTY);
if (CheckFlatLandBelow(tile, 2, 2, flags, 0, NULL) == CMD_ERROR) cost = CheckFlatLandBelow(tile, 2, 2, flags, 0, NULL);
if (cost == CMD_ERROR)
return CMD_ERROR; return CMD_ERROR;
if (p1) if (p1) {
cost = DoCommand( int32 ret = DoCommand(
TileX(p->location_of_house) * 16, TileY(p->location_of_house) * 16, TileX(p->location_of_house) * 16, TileY(p->location_of_house) * 16,
p1 & 0xFF, 0, flags, CMD_DESTROY_COMPANY_HQ); p1 & 0xFF, 0, flags, CMD_DESTROY_COMPANY_HQ);
if (ret == CMD_ERROR)
return CMD_ERROR;
cost += ret;
}
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
score = UpdateCompanyRatingAndValue(p, false); score = UpdateCompanyRatingAndValue(p, false);