gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-19 13:41:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r29) -Fix You cannot take ownership of an oilrig by building right next to it

Browse Source 
-Fix when adding parts to a statin max size is not 15x15 anymore, but _patches.station_spread
This commit is contained in:
darkvater 2004-08-12 21:11:23 +00:00
parent cbec93d9b6
commit 52f8e963c1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
station_cmd.c
View File

@ -43,6 +43,13 @@ static Station *GetStationAround(uint tile, int w, int h, int closest_station)
if (IS_TILETYPE(tile_cur, MP_STATION)) {
int t;
t = _map2[tile_cur];
{
Station *st = DEREF_STATION(t);
// you cannot take control of an oilrig!!
if (st->airport_type == AT_OILRIG && st->facilities == (FACIL_AIRPORT|FACIL_DOCK))
continue;
}
if (closest_station == -1) {
closest_station = t;
} else if (closest_station != t) {
@ -538,16 +545,8 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
static void DeleteStationIfEmpty(Station *st) {
if (st->facilities == 0) {
st->delete_ctr = 0;
}
// if a station next to an oilrig is removed, fix ownership
if (st->airport_type == AT_OILRIG && st->facilities == (FACIL_AIRPORT|FACIL_DOCK) ) {
_station_sort_dirty = true;
InvalidateWindow(WC_STATION_LIST, st->owner);
st->owner = 0x10;
}
InvalidateWindow(WC_STATION_LIST, st->owner);
}
// Tries to clear the given area. Returns the cost in case of success.
@ -657,7 +656,7 @@ static bool CanExpandRailroadStation(Station *st, uint *fin, int direction)
return false;
}
// make sure the final size is not too big.
if (curw > 15 || curh > 15) return false;
if (curw > _patches.station_spread || curh > _patches.station_spread) return false;
// now tile contains the new value for st->train_tile
// curw, curh contain the new value for width and height