miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream branch 1.8

Browse Source
This commit is contained in:
Sergii Pylypenko
2018-05-31 22:59:50 +03:00
parent 59edb9d606 080d57d97a
commit 66e3334f0e
240 changed files with 9655 additions and 2535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/table/airport_defaults.h
+20 -20
View File
@@ -28,7 +28,7 @@
#define MKEND {{-0x80, 0}, 0}
/** Tiles for Country Airfield (small) */
static AirportTileTable _tile_table_country_0[] = {
static const AirportTileTable _tile_table_country_0[] = {
MK(0, 0, APT_SMALL_BUILDING_1),
MK(1, 0, APT_SMALL_BUILDING_2),
MK(2, 0, APT_SMALL_BUILDING_3),
@@ -44,12 +44,12 @@ static AirportTileTable _tile_table_country_0[] = {
MKEND
};
static AirportTileTable *_tile_table_country[] = {
static const AirportTileTable * const _tile_table_country[] = {
_tile_table_country_0,
};
/** Tiles for Commuter Airfield (small) */
static AirportTileTable _tile_table_commuter_0[] = {
static const AirportTileTable _tile_table_commuter_0[] = {
MK(0, 0, APT_TOWER),
MK(1, 0, APT_BUILDING_3),
MK(2, 0, APT_HELIPAD_2_FENCE_NW),
@@ -73,12 +73,12 @@ static AirportTileTable _tile_table_commuter_0[] = {
MKEND
};
static AirportTileTable *_tile_table_commuter[] = {
static const AirportTileTable * const _tile_table_commuter[] = {
_tile_table_commuter_0,
};
/** Tiles for City Airport (large) */
static AirportTileTable _tile_table_city_0[] = {
static const AirportTileTable _tile_table_city_0[] = {
MK(0, 0, APT_BUILDING_1),
MK(1, 0, APT_APRON_FENCE_NW),
MK(2, 0, APT_STAND_1),
@@ -118,12 +118,12 @@ static AirportTileTable _tile_table_city_0[] = {
MKEND
};
static AirportTileTable *_tile_table_city[] = {
static const AirportTileTable * const _tile_table_city[] = {
_tile_table_city_0,
};
/** Tiles for Metropolitain Airport (large) - 2 runways */
static AirportTileTable _tile_table_metropolitan_0[] = {
static const AirportTileTable _tile_table_metropolitan_0[] = {
MK(0, 0, APT_BUILDING_1),
MK(1, 0, APT_APRON_FENCE_NW),
MK(2, 0, APT_STAND_1),
@@ -163,12 +163,12 @@ static AirportTileTable _tile_table_metropolitan_0[] = {
MKEND
};
static AirportTileTable *_tile_table_metropolitan[] = {
static const AirportTileTable * const _tile_table_metropolitan[] = {
_tile_table_metropolitan_0,
};
/** Tiles for International Airport (large) - 2 runways */
static AirportTileTable _tile_table_international_0[] = {
static const AirportTileTable _tile_table_international_0[] = {
MK(0, 0, APT_RUNWAY_END_FENCE_NW),
MK(1, 0, APT_RUNWAY_FENCE_NW),
MK(2, 0, APT_RUNWAY_FENCE_NW),
@@ -221,12 +221,12 @@ static AirportTileTable _tile_table_international_0[] = {
MKEND
};
static AirportTileTable *_tile_table_international[] = {
static const AirportTileTable * const _tile_table_international[] = {
_tile_table_international_0,
};
/** Tiles for International Airport (large) - 2 runways */
static AirportTileTable _tile_table_intercontinental_0[] = {
static const AirportTileTable _tile_table_intercontinental_0[] = {
MK(0, 0, APT_RADAR_FENCE_NE),
MK(1, 0, APT_RUNWAY_END_FENCE_NE_NW),
MK(2, 0, APT_RUNWAY_FENCE_NW),
@@ -329,22 +329,22 @@ static AirportTileTable _tile_table_intercontinental_0[] = {
MKEND
};
static AirportTileTable *_tile_table_intercontinental[] = {
static const AirportTileTable * const _tile_table_intercontinental[] = {
_tile_table_intercontinental_0,
};
/** Tiles for Heliport */
static AirportTileTable _tile_table_heliport_0[] = {
static const AirportTileTable _tile_table_heliport_0[] = {
MK(0, 0, APT_HELIPORT),
MKEND
};
static AirportTileTable *_tile_table_heliport[] = {
static const AirportTileTable * const _tile_table_heliport[] = {
_tile_table_heliport_0,
};
/** Tiles for Helidepot */
static AirportTileTable _tile_table_helidepot_0[] = {
static const AirportTileTable _tile_table_helidepot_0[] = {
MK(0, 0, APT_LOW_BUILDING_FENCE_N),
MK(1, 0, APT_DEPOT_SE),
MK(0, 1, APT_HELIPAD_2_FENCE_NE_SE),
@@ -352,12 +352,12 @@ static AirportTileTable _tile_table_helidepot_0[] = {
MKEND
};
static AirportTileTable *_tile_table_helidepot[] = {
static const AirportTileTable * const _tile_table_helidepot[] = {
_tile_table_helidepot_0,
};
/** Tiles for Helistation */
static AirportTileTable _tile_table_helistation_0[] = {
static const AirportTileTable _tile_table_helistation_0[] = {
MK(0, 0, APT_DEPOT_SE),
MK(1, 0, APT_LOW_BUILDING_FENCE_NW),
MK(2, 0, APT_HELIPAD_3_FENCE_NW),
@@ -369,11 +369,11 @@ static AirportTileTable _tile_table_helistation_0[] = {
MKEND
};
static AirportTileTable *_tile_table_helistation[] = {
static const AirportTileTable * const _tile_table_helistation[] = {
_tile_table_helistation_0,
};
static Direction _default_airports_rotation[] = {
static const Direction _default_airports_rotation[] = {
DIR_N,
};
@@ -410,7 +410,7 @@ extern const AirportSpec _origin_airport_specs[] = {
assert_compile(NEW_AIRPORT_OFFSET == lengthof(_origin_airport_specs));
AirportSpec AirportSpec::dummy = AS_GENERIC(&_airportfta_dummy, NULL, _default_airports_rotation, 0, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR, 0, ATP_TTDP_LARGE, APC_BEGIN, STR_NULL, 0, false);
const AirportSpec AirportSpec::dummy = AS_GENERIC(&_airportfta_dummy, NULL, _default_airports_rotation, 0, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR, 0, ATP_TTDP_LARGE, APC_BEGIN, STR_NULL, 0, false);
#undef AS
#undef AS_ND
src/table/elrail_data.h
+6 -6
View File
@@ -310,10 +310,10 @@ enum WireSpriteOffset {
WSO_X_NE_UP,
WSO_Y_NW_DOWN,
WSO_ENTRANCE_NE,
WSO_ENTRANCE_SE,
WSO_ENTRANCE_SW,
WSO_ENTRANCE_NW,
WSO_ENTRANCE_NE,
WSO_ENTRANCE_SE,
};
struct SortableSpriteStruct {
@@ -400,10 +400,10 @@ static const SortableSpriteStruct RailCatenarySpriteData_Depot[] = {
};
static const SortableSpriteStruct RailCatenarySpriteData_Tunnel[] = {
{ WSO_ENTRANCE_NE, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for NE tunnel exit
{ WSO_ENTRANCE_SE, 7, 0, 1, 15, 1, ELRAIL_ELEVATION }, //! Wire for SE tunnel exit
{ WSO_ENTRANCE_SW, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for SW tunnel exit
{ WSO_ENTRANCE_NW, 7, 0, 1, 15, 1, ELRAIL_ELEVATION } //! Wire for NW tunnel exit
{ WSO_ENTRANCE_SW, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for NE tunnel (SW facing exit)
{ WSO_ENTRANCE_NW, 7, 0, 1, 15, 1, ELRAIL_ELEVATION }, //! Wire for SE tunnel (NW facing exit)
{ WSO_ENTRANCE_NE, 0, 7, 15, 1, 1, ELRAIL_ELEVATION }, //! Wire for SW tunnel (NE facing exit)
{ WSO_ENTRANCE_SE, 7, 0, 1, 15, 1, ELRAIL_ELEVATION } //! Wire for NW tunnel (SE facing exit)
};
src/table/settings.ini
+9 -1
View File
@@ -2190,7 +2190,7 @@ cat = SC_BASIC
base = GameSettings
var = game_creation.variety
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
from = 197
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 0
min = 0
@@ -2634,6 +2634,14 @@ str = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING
strhelp = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT
cat = SC_BASIC
[SDTC_BOOL]
var = gui.right_mouse_wnd_close
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE
strhelp = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT
cat = SC_BASIC
[SDTC_BOOL]
var = gui.measure_tooltip
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC