Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Darkvater 2005-05-11 16:29:33 +00:00
parent 729066e407
commit a72c06d845
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unmovable_cmd.c
View File

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