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

Merge 1.9.0-beta2

Browse Source
This commit is contained in:
Pavel Stupnikov
2019-02-14 00:47:22 +03:00
parent c2d889eab3 2bda8d4f34
commit 6e2a54355a
1364 changed files with 22213 additions and 10721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/table/airport_defaults.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: airport_defaults.h 27908 2017-08-31 06:55:38Z adf88 $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/airport_movement.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: airport_movement.h 22741 2011-08-13 12:43:05Z alberth $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/airporttile_ids.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: airporttile_ids.h 19099 2010-02-11 20:52:56Z yexo $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/airporttiles.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: airporttiles.h 20623 2010-08-26 15:31:40Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/animcursors.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: animcursors.h 24900 2013-01-08 22:46:42Z planetmaker $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/autorail.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: autorail.h 17248 2009-08-21 20:21:05Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/bridge_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: bridge_land.h 24900 2013-01-08 22:46:42Z planetmaker $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/build_industry.h
+21 -4
View File
@@ -1,4 +1,4 @@
/* $Id: build_industry.h 27137 2015-02-06 21:54:19Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -293,6 +293,19 @@ static const IndustryTileTable _tile_table_oil_rig_0[] = {
MK(-2, -4, 255),
MK(-3, -4, 255),
MK(2, 0, 255),
MK(2, -1, 255),
MK(1, -1, 255),
MK(0, -1, 255),
MK(-1, -1, 255),
MK(-1, 0, 255),
MK(-1, 1, 255),
MK(-1, 2, 255),
MK(-1, 3, 255),
MK(0, 3, 255),
MK(1, 3, 255),
MK(2, 3, 255),
MK(2, 2, 255),
MK(2, 1, 255),
MKEND
};
@@ -1182,8 +1195,12 @@ enum IndustryTypes {
#define MI(tbl, sndc, snd, d, pc, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col, \
c1, c2, c3, proc, p1, r1, p2, r2, m, a1, im1, a2, im2, a3, im3, pr, clim, bev, in, intx, s1, s2, s3) \
{tbl, lengthof(tbl), d, 0, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \
{a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, in, intx, s1, s2, s3, STR_UNDEFINED, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \
{tbl, lengthof(tbl), d, 0, pc, {c1, c2, c3}, proc, \
{p1, p2, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID}, \
{r1, r2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, m, \
{a1, a2, a3, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID}, \
{{im1, 0}, {im2, 0}, {im3, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}, \
pr, clim, bev, col, in, intx, s1, s2, s3, STR_UNDEFINED, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \
sndc, snd, 0, 0, true, GRFFileProps(INVALID_INDUSTRYTYPE)}
/* Format:
tile table count and sounds table
@@ -1581,7 +1598,7 @@ static const IndustrySpec _origin_industry_specs[NEW_INDUSTRYOFFSET] = {
* @param a2 next frame of animation
* @param a3 chooses between animation or construction state
*/
#define MT(ca1, c1, ca2, c2, ca3, c3, sl, a1, a2, a3) {{c1, c2, c3}, {ca1, ca2, ca3}, sl, a1, a2, a3, 0, {0, ANIM_STATUS_NO_ANIMATION, 2, 0}, INDTILE_SPECIAL_NONE, true, GRFFileProps(INVALID_INDUSTRYTILE)}
#define MT(ca1, c1, ca2, c2, ca3, c3, sl, a1, a2, a3) {{c1, c2, c3, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID}, {ca1, ca2, ca3}, sl, a1, a2, a3, 0, {0, ANIM_STATUS_NO_ANIMATION, 2, 0}, INDTILE_SPECIAL_NONE, true, GRFFileProps(INVALID_INDUSTRYTILE)}
static const IndustryTileSpec _origin_industry_tile_specs[NEW_INDUSTRYTILEOFFSET] = {
/* Coal Mine */
MT(0, CT_INVALID, 0, CT_INVALID, 0, CT_INVALID, SLOPE_STEEP, INDUSTRYTILE_NOANIM, INDUSTRYTILE_NOANIM, false),
src/table/cargo_const.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: cargo_const.h 23862 2012-01-28 14:12:42Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/clear_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: clear_land.h 23188 2011-11-11 18:01:41Z yexo $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/company_settings.ini
+2 -2
View File
@@ -1,4 +1,4 @@
; $Id: company_settings.ini 24996 2013-02-14 17:08:56Z rubidium $
; $Id$
;
; This file is part of OpenTTD.
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -31,7 +31,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
src/table/control_codes.h
+10 -5
View File
@@ -1,4 +1,4 @@
/* $Id: control_codes.h 27706 2016-12-23 13:38:50Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -26,9 +26,13 @@ enum StringControlCode {
/* This must be the first entry. It's encoded in strings that are saved. */
SCC_ENCODED = SCC_CONTROL_START,
/* Display control codes */
SCC_TINYFONT, ///< Switch to small font
SCC_BIGFONT, ///< Switch to large font
/* Font selection codes, must be in same order as FontSize enum */
SCC_FIRST_FONT,
SCC_NORMALFONT = SCC_FIRST_FONT, ///< Switch to normal size font
SCC_TINYFONT, ///< Switch to small font
SCC_BIGFONT, ///< Switch to large font
SCC_MONOFONT, ///< Switch to monospaced font
SCC_LAST_FONT = SCC_MONOFONT,
/* Formatting control codes */
SCC_REVISION,
@@ -111,7 +115,8 @@ enum StringControlCode {
SCC_GRAY,
SCC_DKBLUE,
SCC_BLACK,
SCC_PREVIOUS_COLOUR,
SCC_PUSH_COLOUR,
SCC_POP_COLOUR,
/**
* The next variables are part of a NewGRF subsystem for creating text strings.
src/table/currency_settings.ini
+2 -2
View File
@@ -1,4 +1,4 @@
; $Id: currency_settings.ini 24671 2012-11-08 10:04:00Z frosch $
; $Id$
;
; This file is part of OpenTTD.
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -25,7 +25,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
src/table/elrail_data.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: elrail_data.h 27972 2018-03-05 21:24:48Z peter1138 $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/engines.h
+19 -6
View File
@@ -1,4 +1,4 @@
/* $Id: engines.h 25115 2013-03-22 21:27:13Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -28,6 +28,19 @@
*/
#define MT(a, b, c, d, e, f) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, f, e, 0, 8, 1 << EF_RAIL_FLIPS, 0, 0, STR_EMPTY, CARGO_AGING_TICKS }
/**
* Writes the properties of a multiple-unit train into the EngineInfo struct.
* @see EngineInfo
* @param a base introduction date (days since 1920-01-01)
* @param b decay speed
* @param c life length (years)
* @param d base life (years)
* @param e cargo type
* @param f Bitmask of the climates
* @note the 5 between b and f is the load amount
*/
#define MM(a, b, c, d, e, f) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, f, e, 0, 8, 1 << EF_RAIL_FLIPS | 1 << EF_RAIL_IS_MU, 0, 0, STR_EMPTY, CARGO_AGING_TICKS }
/**
* Writes the properties of a train carriage into the EngineInfo struct.
* @param a base introduction date (days since 1920-01-01)
@@ -102,8 +115,8 @@ static const EngineInfo _orig_engine_info[] = {
MT( 5114, 20, 21, 30, 0 , T ), // 8 Chaney 'Jubilee' (Steam)
MT( 5479, 20, 20, 30, 0 , T ), // 9 Ginzu 'A4' (Steam)
MT( 12419, 20, 23, 25, 0 , T ), // 10 SH '8P' (Steam)
MT( 13149, 20, 12, 30, CT_PASSENGERS , T ), // 11 Manley-Morel DMU (Diesel)
MT( 23376, 20, 15, 35, CT_PASSENGERS , T ), // 12 'Dash' (Diesel)
MM( 13149, 20, 12, 30, CT_PASSENGERS , T ), // 11 Manley-Morel DMU (Diesel)
MM( 23376, 20, 15, 35, CT_PASSENGERS , T ), // 12 'Dash' (Diesel)
MT( 14976, 20, 18, 28, 0 , T ), // 13 SH/Hendry '25' (Diesel)
MT( 14245, 20, 20, 30, 0 , T ), // 14 UU '37' (Diesel)
MT( 15341, 20, 22, 33, 0 , T ), // 15 Floss '47' (Diesel)
@@ -111,13 +124,13 @@ static const EngineInfo _orig_engine_info[] = {
MT( 16437, 20, 20, 30, 0 , A|S ), // 17 CS 2400 (Diesel)
MT( 18993, 20, 22, 30, 0 , A|S ), // 18 Centennial (Diesel)
MT( 13880, 20, 22, 30, 0 , A|S ), // 19 Kelling 3100 (Diesel)
MT( 20454, 20, 22, 30, 0 , A|S ), // 20 Turner Turbo (Diesel)
MM( 20454, 20, 22, 30, 0 , A|S ), // 20 Turner Turbo (Diesel)
MT( 16071, 20, 22, 30, 0 , A|S ), // 21 MJS 1000 (Diesel)
MT( 20820, 20, 20, 25, CT_MAIL , T ), // 22 SH '125' (Diesel)
MT( 16437, 20, 23, 30, 0 , T ), // 23 SH '30' (Electric)
MT( 19359, 20, 23, 80, 0 , T ), // 24 SH '40' (Electric)
MT( 23376, 20, 25, 30, 0 , T ), // 25 'T.I.M.' (Electric)
MT( 26298, 20, 25, 50, 0 , T ), // 26 'AsiaStar' (Electric)
MM( 23376, 20, 25, 30, 0 , T ), // 25 'T.I.M.' (Electric)
MM( 26298, 20, 25, 50, 0 , T ), // 26 'AsiaStar' (Electric)
MW( 1827, 20, 20, 50, CT_PASSENGERS , T|A|S|Y), // 27 Passenger Carriage
MW( 1827, 20, 20, 50, CT_MAIL , T|A|S|Y), // 28 Mail Van
MW( 1827, 20, 20, 50, CT_COAL , T|A ), // 29 Coal Truck
src/table/gameopt_settings.ini
+9 -9
View File
@@ -1,4 +1,4 @@
; $Id: gameopt_settings.ini 26206 2014-01-02 17:55:57Z frosch $
; $Id$
;
; This file is part of OpenTTD.
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -59,7 +59,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
@@ -77,7 +77,7 @@ def = 0
min = 0
max = 0
full = NULL
to = 3
to = SLV_4
[SDTG_GENERAL]
name = ""diff_custom""
@@ -91,7 +91,7 @@ def = 0
min = 0
max = 0
full = NULL
from = 4
from = SLV_4
##
[SDTG_VAR]
@@ -152,21 +152,21 @@ type = SLE_UINT8
def = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT
min = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
max = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
to = 21
to = SLV_22
[SDT_NULL]
length = 1
from = 22
to = 164
from = SLV_22
to = SLV_165
[SDT_NULL]
length = 1
to = 22
to = SLV_23
[SDTC_OMANY]
var = gui.autosave
type = SLE_UINT8
from = 23
from = SLV_23
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 1
max = 4
src/table/genland.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: genland.h 17248 2009-08-21 20:21:05Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/heightmap_colours.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: heightmap_colours.h 26930 2014-09-27 14:51:34Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/industry_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: industry_land.h 20286 2010-08-01 19:44:49Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/landscape_sprite.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: landscape_sprite.h 24877 2013-01-01 10:52:32Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/misc_settings.ini
+2 -2
View File
@@ -1,4 +1,4 @@
; $Id: misc_settings.ini 26990 2014-10-11 13:22:37Z peter1138 $
; $Id$
;
; This file is part of OpenTTD.
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -32,7 +32,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
src/table/newgrf_debug_data.h
+33 -6
View File
@@ -1,4 +1,4 @@
/* $Id: newgrf_debug_data.h 27654 2016-09-05 19:11:01Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -272,11 +272,38 @@ static const NIFeature _nif_industrytile = {
/*** NewGRF industries ***/
static const NIProperty _nip_industries[] = {
NIP(0x10, Industry, produced_cargo[0], NIT_CARGO, "produced cargo 0"),
NIP(0x10, Industry, produced_cargo[1], NIT_CARGO, "produced cargo 1"),
NIP(0x11, Industry, accepts_cargo[0], NIT_CARGO, "accepted cargo 0"),
NIP(0x11, Industry, accepts_cargo[1], NIT_CARGO, "accepted cargo 1"),
NIP(0x11, Industry, accepts_cargo[2], NIT_CARGO, "accepted cargo 2"),
NIP(0x25, Industry, produced_cargo[ 0], NIT_CARGO, "produced cargo 0"),
NIP(0x25, Industry, produced_cargo[ 1], NIT_CARGO, "produced cargo 1"),
NIP(0x25, Industry, produced_cargo[ 2], NIT_CARGO, "produced cargo 2"),
NIP(0x25, Industry, produced_cargo[ 3], NIT_CARGO, "produced cargo 3"),
NIP(0x25, Industry, produced_cargo[ 4], NIT_CARGO, "produced cargo 4"),
NIP(0x25, Industry, produced_cargo[ 5], NIT_CARGO, "produced cargo 5"),
NIP(0x25, Industry, produced_cargo[ 6], NIT_CARGO, "produced cargo 6"),
NIP(0x25, Industry, produced_cargo[ 7], NIT_CARGO, "produced cargo 7"),
NIP(0x25, Industry, produced_cargo[ 8], NIT_CARGO, "produced cargo 8"),
NIP(0x25, Industry, produced_cargo[ 9], NIT_CARGO, "produced cargo 9"),
NIP(0x25, Industry, produced_cargo[10], NIT_CARGO, "produced cargo 10"),
NIP(0x25, Industry, produced_cargo[11], NIT_CARGO, "produced cargo 11"),
NIP(0x25, Industry, produced_cargo[12], NIT_CARGO, "produced cargo 12"),
NIP(0x25, Industry, produced_cargo[13], NIT_CARGO, "produced cargo 13"),
NIP(0x25, Industry, produced_cargo[14], NIT_CARGO, "produced cargo 14"),
NIP(0x25, Industry, produced_cargo[15], NIT_CARGO, "produced cargo 15"),
NIP(0x26, Industry, accepts_cargo[ 0], NIT_CARGO, "accepted cargo 0"),
NIP(0x26, Industry, accepts_cargo[ 1], NIT_CARGO, "accepted cargo 1"),
NIP(0x26, Industry, accepts_cargo[ 2], NIT_CARGO, "accepted cargo 2"),
NIP(0x26, Industry, accepts_cargo[ 3], NIT_CARGO, "accepted cargo 3"),
NIP(0x26, Industry, accepts_cargo[ 4], NIT_CARGO, "accepted cargo 4"),
NIP(0x26, Industry, accepts_cargo[ 5], NIT_CARGO, "accepted cargo 5"),
NIP(0x26, Industry, accepts_cargo[ 6], NIT_CARGO, "accepted cargo 6"),
NIP(0x26, Industry, accepts_cargo[ 7], NIT_CARGO, "accepted cargo 7"),
NIP(0x26, Industry, accepts_cargo[ 8], NIT_CARGO, "accepted cargo 8"),
NIP(0x26, Industry, accepts_cargo[ 9], NIT_CARGO, "accepted cargo 9"),
NIP(0x26, Industry, accepts_cargo[10], NIT_CARGO, "accepted cargo 10"),
NIP(0x26, Industry, accepts_cargo[11], NIT_CARGO, "accepted cargo 11"),
NIP(0x26, Industry, accepts_cargo[12], NIT_CARGO, "accepted cargo 12"),
NIP(0x26, Industry, accepts_cargo[13], NIT_CARGO, "accepted cargo 13"),
NIP(0x26, Industry, accepts_cargo[14], NIT_CARGO, "accepted cargo 14"),
NIP(0x26, Industry, accepts_cargo[15], NIT_CARGO, "accepted cargo 15"),
NIP_END()
};
src/table/object_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: object_land.h 27183 2015-03-13 19:42:49Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/palette_convert.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: palette_convert.h 23433 2011-12-04 19:07:24Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/palettes.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: palettes.h 27340 2015-07-26 09:47:17Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/pricebase.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: pricebase.h 23931 2012-02-11 22:43:39Z michi_cc $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/railtypes.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: railtypes.h 24368 2012-07-02 15:55:13Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/road_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: road_land.h 19056 2010-02-07 22:22:54Z peter1138 $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/roadveh_movement.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: roadveh_movement.h 21263 2010-11-20 09:09:57Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/settings.h.preamble
+4 -4
View File
@@ -1,4 +1,4 @@
/* $Id: settings.h.preamble 24991 2013-02-14 11:06:01Z matthijs $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -74,7 +74,7 @@ static size_t ConvertLandscape(const char *value);
SDTG_GENERAL(name, SDT_INTLIST, SL_ARR, type, flags, guiflags, var, length, def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTG_STR(name, type, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, lengthof(var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, sizeof(var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTG_OMANY(name, type, flags, guiflags, var, def, max, full, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
@@ -102,7 +102,7 @@ static size_t ConvertLandscape(const char *value);
SDT_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_STR(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, sizeof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_CHR(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_STRING, SL_VAR, SLE_CHAR, flags, guiflags, base, var, 1, def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
@@ -127,7 +127,7 @@ static size_t ConvertLandscape(const char *value);
SDTG_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTC_STR(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
SDTG_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, _settings_client.var, sizeof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTC_OMANY(var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
src/table/settings.ini
+216 -199
View File
File diff suppressed because it is too large Load Diff
src/table/sprites.h
+7 -2
View File
@@ -1,4 +1,4 @@
/* $Id: sprites.h 27020 2014-10-15 18:31:37Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -56,7 +56,7 @@ static const SpriteID SPR_LARGE_SMALL_WINDOW = 682;
/** Extra graphic spritenumbers */
static const SpriteID SPR_OPENTTD_BASE = 4896;
static const uint16 OPENTTD_SPRITE_COUNT = 175;
static const uint16 OPENTTD_SPRITE_COUNT = 179;
/* Halftile-selection sprites */
static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE;
@@ -149,6 +149,11 @@ static const SpriteID SPR_GROUP_REPLACE_OFF_ROADVEH = SPR_OPENTTD_BASE + 131;
static const SpriteID SPR_GROUP_REPLACE_OFF_SHIP = SPR_OPENTTD_BASE + 132;
static const SpriteID SPR_GROUP_REPLACE_OFF_AIRCRAFT = SPR_OPENTTD_BASE + 133;
static const SpriteID SPR_GROUP_LIVERY_TRAIN = SPR_OPENTTD_BASE + 175;
static const SpriteID SPR_GROUP_LIVERY_ROADVEH = SPR_OPENTTD_BASE + 176;
static const SpriteID SPR_GROUP_LIVERY_SHIP = SPR_OPENTTD_BASE + 177;
static const SpriteID SPR_GROUP_LIVERY_AIRCRAFT = SPR_OPENTTD_BASE + 178;
static const SpriteID SPR_TOWN_RATING_NA = SPR_OPENTTD_BASE + 162;
static const SpriteID SPR_TOWN_RATING_APALLING = SPR_OPENTTD_BASE + 163;
static const SpriteID SPR_TOWN_RATING_MEDIOCRE = SPR_OPENTTD_BASE + 164;
src/table/station_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: station_land.h 23010 2011-10-07 07:56:30Z planetmaker $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/strgen_tables.h
+5 -1
View File
@@ -1,4 +1,4 @@
/* $Id: strgen_tables.h 27295 2015-05-28 17:26:53Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -37,8 +37,10 @@ extern void EmitGender(Buffer *buffer, char *buf, int value);
static const CmdStruct _cmd_structs[] = {
/* Font size */
{"NORMAL_FONT", EmitSingleChar, SCC_NORMALFONT, 0, -1, C_NONE},
{"TINY_FONT", EmitSingleChar, SCC_TINYFONT, 0, -1, C_NONE},
{"BIG_FONT", EmitSingleChar, SCC_BIGFONT, 0, -1, C_NONE},
{"MONO_FONT", EmitSingleChar, SCC_MONOFONT, 0, -1, C_NONE},
/* Colours */
{"BLUE", EmitSingleChar, SCC_BLUE, 0, -1, C_DONTCOUNT},
@@ -58,6 +60,8 @@ static const CmdStruct _cmd_structs[] = {
{"GRAY", EmitSingleChar, SCC_GRAY, 0, -1, C_DONTCOUNT},
{"DKBLUE", EmitSingleChar, SCC_DKBLUE, 0, -1, C_DONTCOUNT},
{"BLACK", EmitSingleChar, SCC_BLACK, 0, -1, C_DONTCOUNT},
{"PUSH_COLOUR", EmitSingleChar, SCC_PUSH_COLOUR, 0, -1, C_DONTCOUNT},
{"POP_COLOUR", EmitSingleChar, SCC_POP_COLOUR, 0, -1, C_DONTCOUNT},
{"REV", EmitSingleChar, SCC_REVISION, 0, -1, C_NONE}, // openttd revision string
src/table/string_colours.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: string_colours.h 27378 2015-08-10 10:04:14Z alberth $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/town_land.h
+6 -3
View File
@@ -1,4 +1,4 @@
/* $Id: town_land.h 25312 2013-06-01 07:44:53Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -1812,8 +1812,11 @@ assert_compile(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4);
* @see HouseSpec
*/
#define MS(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \
{mnd, mxd, p, rc, bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \
GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
{mnd, mxd, p, rc, bn, rr, mg, \
{ca1, ca2, ca3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
{cg1, cg2, cg3, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID}, \
bf, ba, true, GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, \
16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
/** House specifications from original data */
static const HouseSpec _original_house_specs[] = {
/**
src/table/townname.h
+64 -64
View File
@@ -1,4 +1,4 @@
/* $Id: townname.h 27002 2014-10-12 18:26:54Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -639,7 +639,7 @@ static const char * const _name_spanish_real[] = {
"Barcelona",
"Barinas",
"San Crist\xC3\xB3""bal",
"San Fransisco",
"San Francisco",
"San Mart\xC3\xADn",
"Guayana",
"San Carlos",
@@ -650,19 +650,19 @@ static const char * const _name_spanish_real[] = {
"Elorza",
"Arismendi",
"Trujillo",
"Carupano",
"Car\xC3\xBApano",
"Anaco",
"Lima",
"Cuzco",
"Iquitos",
"Callao",
"Huacho",
"Camana",
"Caman\xC3\xA1",
"Puerto Chala",
"Santa Cruz",
"Quito",
"Cuenca",
"Huacho",
"Medell\xC3\xADn",
"Tulc\xC3\xA1n",
"Esmeraldas",
"Ibarra",
@@ -684,12 +684,12 @@ static const char * const _name_spanish_real[] = {
"Potos\xC3\xAD",
"Tupiza",
"La Quiaca",
"Yacuiba",
"Yacu\xC3\xAD""ba",
"San Borja",
"Fuerte Olimpio",
"Fuerte Olimpo",
"Fort\xC3\xADn Esteros",
"Campo Grande",
"Bogota",
"Bogot\xC3\xA1",
"El Banco",
"Zaragoza",
"Neiva",
@@ -758,7 +758,7 @@ static const char * const _name_french_real[] = {
"Blois",
"Troyes",
"Charolles",
"Grenoble",
"Toulouse",
"Chamb\xC3\xA9ry",
"Tours",
"St. Brieuc",
@@ -769,7 +769,7 @@ static const char * const _name_french_real[] = {
"Vichy",
"St. Valery",
"Beaujolais",
"Narbonne",
"Reims",
"Albi",
"Paris",
"Biarritz",
@@ -1942,103 +1942,103 @@ static const char * const _name_romanian_real[] = {
"Alba Iulia",
"Alexandria",
"Babadag",
"Bac\xC3\xA3u",
"Bac\xC4\x83u",
"Baia Mare",
"B\xC3\xA3ile Herculane",
"B\xC3\xA3ilesti",
"B\xC4\x83ile Herculane",
"B\xC4\x83ilesti",
"B\xC3\xA2rlad",
"Bicaz",
"Bistrita",
"Bistri\xC8\x9B""a",
"Blaj",
"Borsec",
"Botosani",
"Br\xC3\xA3ila",
"Brasov",
"Bucuresti",
"Boto\xC8\x99""ani",
"Br\xC4\x83ila",
"Bra\xC8\x9Bov",
"Bucure\xC8\x99ti",
"Buftea",
"Buz\xC3\xA3u",
"C\xC3\xA3l\xC3\xA3rasi",
"Caransebes",
"Cernavod\xC3\xA3",
"Buz\xC4\x83u",
"C\xC4\x83l\xC4\x83rasi",
"Caransebe\xC8\x99",
"Cernavod\xC4\x83",
"Cluj-Napoca",
"Constanta",
"Constan\xC8\x9B""a",
"Covasna",
"Craiova",
"Dej",
"Deva",
"Dorohoi",
"Dr.-Tr. Severin",
"Dr\xC3\xA3g\xC3\xA3sani",
"F\xC3\xA3g\xC3\xA3ras",
"F\xC3\xA3lticeni",
"Fetesti",
"Focsani",
"Galati",
"Drobeta-Turnu Severin",
"Dr\xC4\x83g\xC4\x83sani",
"F\xC4\x83g\xC4\x83ras",
"F\xC4\x83lticeni",
"Fete\xC8\x99ti",
"Foc\xC8\x99""ani",
"Gala\xC8\x99i",
"Gheorgheni",
"Giurgiu",
"H\xC3\xA2rsova",
"H\xC3\xA2r\xC8\x99ova",
"Hunedoara",
"Husi",
"Iasi",
"Hu\xC8\x99i",
"Ia\xC8\x99i",
"Isaccea",
"Lugoj",
"M\xC3\xA3""cin",
"M\xC4\x83""cin",
"Mangalia",
"Medgidia",
"Medias",
"Media\xC8\x99",
"Miercurea Ciuc",
"Mizil",
"Motru",
"N\xC3\xA3s\xC3\xA3ud",
"N\xC3\xA3vodari",
"Odobesti",
"Oltenita",
"Onesti",
"N\xC4\x83s\xC4\x83ud",
"N\xC4\x83vodari",
"Odobe\xC8x99ti",
"Olteni\xC8\x9B""a",
"One\xC8\x99ti",
"Oradea",
"Orsova",
"Petrosani",
"Piatra Neamt",
"Pitesti",
"Ploiesti",
"Or\xC8\x99ova",
"Petro\xC8\x99""ani",
"Piatra Neam\xC8\x9B",
"Pite\xC8\x99ti",
"Ploie\xC8\x99ti",
"Predeal",
"R\xC3\xA2mnicu V\xC3\xA2lcea",
"Reghin",
"Resita",
"Re\xC8\x99i\xC8\x9B""a",
"Roman",
"Rosiorii de Vede",
"Ro\xC8\x99iorii de Vede",
"Satu Mare",
"Sebes",
"Sebe\xC8\x99",
"Sf\xC3\xA2ntu Gheorghe",
"Sibiu",
"Sighisoara",
"Sighi\xC8\x99oara",
"Sinaia",
"Slatina",
"Slobozia",
"Sovata",
"Suceava",
"Sulina",
"T\xC3\xA3nd\xC3\xA3rei",
"T\xC4\x83nd\xC4\x83rei",
"T\xC3\xA2rgoviste",
"T\xC3\xA2rgu Jiu",
"T\xC3\xA2rgu Mures",
"Tecuci",
"Timisoara",
"Timi\xC8\x99oara",
"Tulcea",
"Turda",
"Turnu M\xC3\xA3gurele",
"Turnu M\xC4\x83gurele",
"Urziceni",
"Vaslui",
"Vatra Dornei",
"Victoria",
"Videle",
"Zal\xC3\xA3u",
"Zal\xC4\x83u",
};
static const char * const _name_slovak_real[] = {
"Bratislava",
"Banovce nad Bebravou",
"Banska Bystrica",
"Banska Stiavnica",
"Bansk\xC3\xA1 Bystrica",
"Bansk\xC3\xA1 \xC5\xA0tiavnica",
"Bardejov",
"Brezno",
"Brezova pod Bradlom",
@@ -2046,9 +2046,9 @@ static const char * const _name_slovak_real[] = {
"Cadca",
"Cierna nad Tisou",
"Detva",
"Detva",
"Dolny Kubin",
"Pre\xC5\xA1ov",
"Dolny Kubin",
"Spi\xC5\xA1sk\xC3\xA1 Nov\xC3\xA1 Ves",
"Dunajska Streda",
"Gabcikovo",
"Galanta",
@@ -2060,8 +2060,8 @@ static const char * const _name_slovak_real[] = {
"Humenne",
"Hurbanovo",
"Kezmarok",
"Komarno",
"Kosice",
"Kom\xC3\xA1rno",
"Ko\xC5\xA1ice",
"Kremnica",
"Krompachy",
"Kuty",
@@ -2077,15 +2077,15 @@ static const char * const _name_slovak_real[] = {
"Myjava",
"Namestovo",
"Nitra",
"Nova Bana",
"Nove Mesto nad Vahom",
"Nove Zamky",
"Nov\xC3\xA1 Ba\xC5\x88""a",
"Nov\xC3\xA9"" Mesto nad V\xC3\xA1hom",
"Nov\xC3\xA9"" Z\xC3\xA1""mky",
"Partizanske",
"Pezinok",
"Piestany",
"Poltar",
"Poprad",
"Povazska Bystrica",
"Pova\xC5\xBEsk\xC3\xA1 Bystrica",
"Prievidza",
"Puchov",
"Revuca",
@@ -2119,7 +2119,7 @@ static const char * const _name_slovak_real[] = {
"Zahorska Bystrica",
"Zdiar",
"Ziar nad Hronom",
"Zilina",
"\xC5\xBDilina",
"Zlate Moravce",
"Zvolen",
};
src/table/track_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: track_land.h 17248 2009-08-21 20:21:05Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/train_cmd.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: train_cmd.h 26130 2013-11-26 16:08:58Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/tree_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: tree_land.h 17455 2009-09-07 13:38:57Z yexo $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/unicode.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: unicode.h 23582 2011-12-17 21:42:11Z rubidium $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/water_land.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* $Id: water_land.h 22646 2011-07-10 13:04:04Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
src/table/win32_settings.ini
+4 -4
View File
@@ -1,4 +1,4 @@
; $Id: win32_settings.ini 26522 2014-04-27 12:15:14Z frosch $
; $Id$
;
; This file is part of OpenTTD.
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -8,14 +8,14 @@
[pre-amble]
/* win32_v.cpp only settings */
#if defined(WIN32) && !defined(DEDICATED)
#if defined(_WIN32) && !defined(DEDICATED)
extern bool _force_full_redraw, _window_maximize;
extern uint _display_hz;
static const SettingDescGlobVarList _win32_settings[] = {
[post-amble]
};
#endif /* WIN32 */
#endif /* _WIN32 */
[templates]
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat),
@@ -30,7 +30,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
src/table/window_settings.ini
+2 -2
View File
@@ -1,4 +1,4 @@
; $Id: window_settings.ini 25295 2013-05-26 19:30:31Z frosch $
; $Id$
;
; This file is part of OpenTTD.
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -26,7 +26,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED