mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r22599) [1.1] -Backport from trunk:
- Fix: Clear airport persistent storage on construction/removal of airports (r22552) - Fix: Possible crash when opening the airport build window for the first time [FS#4619] (r22538) - Fix: Replace the half small airport structure on the intercontinental airport with some grass [FS#3494] (r22537) - Fix: Documentation omission regarding admin protocol [FS#4632] (r22536)
This commit is contained in:
parent
4ba397c285
commit
5cb560d4bd
Binary file not shown.
|
@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
|
|||
TRGC.GRF = ed446637e034104c5559b32c18afe78d
|
||||
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
|
||||
TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6
|
||||
OPENTTD.GRF = 066f0ce5500e0e8f5332aee42e2451a2
|
||||
OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
|
||||
|
||||
[origin]
|
||||
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
|
||||
|
|
|
@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
|
|||
TRGC.GRF = ed446637e034104c5559b32c18afe78d
|
||||
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
|
||||
TRGT.GRF = fcde1d7e8a74197d72a62695884b909e
|
||||
OPENTTD.GRF = 066f0ce5500e0e8f5332aee42e2451a2
|
||||
OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
|
||||
|
||||
[origin]
|
||||
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
|
||||
|
|
|
@ -55,7 +55,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32
|
|||
TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b
|
||||
TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1
|
||||
TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8
|
||||
OPENTTD.GRF = 066f0ce5500e0e8f5332aee42e2451a2
|
||||
OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
|
||||
|
||||
[origin]
|
||||
default = You can find it on your Transport Tycoon Deluxe CD-ROM.
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
@ -587,4 +587,5 @@ static void ShowBuildAirportPicker(Window *parent)
|
|||
void InitializeAirportGui()
|
||||
{
|
||||
_selected_airport_class = APC_BEGIN;
|
||||
_selected_airport_index = -1;
|
||||
}
|
||||
|
|
|
@ -295,6 +295,7 @@ protected:
|
|||
* uint64 Money.
|
||||
* uint64 Loan.
|
||||
* uint64 Income.
|
||||
* uint16 Delivered cargo (this quarter).
|
||||
* uint64 Company value (last quarter).
|
||||
* uint16 Performance (last quarter).
|
||||
* uint16 Delivered cargo (last quarter).
|
||||
|
|
|
@ -63,6 +63,12 @@ struct PersistentStorageArray : BaseStorageArray {
|
|||
free(this->prev_storage);
|
||||
}
|
||||
|
||||
/** Resets all values to zero. */
|
||||
void ResetToZero()
|
||||
{
|
||||
memset(this->storage, 0, sizeof(this->storage));
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores some value at a given position.
|
||||
* If there is no backup of the data that backup is made and then
|
||||
|
|
|
@ -2184,6 +2184,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
|
|||
st->airport.layout = layout;
|
||||
st->airport.flags = 0;
|
||||
st->airport.rotation = rotation;
|
||||
st->airport.psa.ResetToZero();
|
||||
|
||||
st->rect.BeforeAddRect(tile, w, h, StationRect::ADD_TRY);
|
||||
|
||||
|
@ -2280,6 +2281,7 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
|
|||
|
||||
st->airport.Clear();
|
||||
st->facilities &= ~FACIL_AIRPORT;
|
||||
st->airport.psa.ResetToZero();
|
||||
|
||||
SetWindowWidgetDirty(WC_STATION_VIEW, st->index, SVW_PLANES);
|
||||
|
||||
|
|
|
@ -245,8 +245,8 @@ static AirportTileTable _tile_table_intercontinental_0[] = {
|
|||
MK(6, 1, APT_RUNWAY_2),
|
||||
MK(7, 1, APT_RUNWAY_END_FENCE_SE_SW),
|
||||
MK(8, 1, APT_APRON_FENCE_NE_SW),
|
||||
MK(0, 2, APT_APRON_FENCE_NE),
|
||||
MK(1, 2, APT_SMALL_BUILDING_1),
|
||||
MK(0, 2, APT_APRON_FENCE_NE_SW),
|
||||
MK(1, 2, APT_EMPTY),
|
||||
MK(2, 2, APT_APRON_FENCE_NE),
|
||||
MK(3, 2, APT_APRON),
|
||||
MK(4, 2, APT_APRON),
|
||||
|
|
Loading…
Reference in New Issue