dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cpp-11

Browse Source 
# Conflicts:
#	config.lib
This commit is contained in:
Jonathan G Rennison
2019-04-09 18:47:28 +01:00
parent 466b9a9595 812886ca61
commit 01261daec0
553 changed files with 11528 additions and 11316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/gameopt_settings.ini
View File

@@ -21,9 +21,7 @@ static const char *_climates = "temperate|arctic|tropic|toyland";
static const char *_autosave_interval = "off|monthly|quarterly|half year|yearly";
static const char *_roadsides = "left|right";
static const char *_savegame_date = "long|short|iso";
#ifdef ENABLE_NETWORK
static const char *_server_langs = "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN";
#endif /* ENABLE_NETWORK */
static const char *_osk_activation = "disabled|double|single|immediately";
static const char *_settings_profiles = "easy|medium|hard";
static const char *_news_display = "off|summarized|full";

9
src/table/misc_settings.ini
View File

@@ -308,5 +308,14 @@ min = ZOOM_LVL_MIN
max = ZOOM_LVL_OUT_4X
cat = SC_BASIC
[SDTG_VAR]
name = ""font_zoom""
type = SLE_UINT8
var = _font_zoom
def = ZOOM_LVL_OUT_4X
min = ZOOM_LVL_MIN
max = ZOOM_LVL_OUT_4X
cat = SC_BASIC
[SDTG_END]

136
src/table/newgrf_debug_data.h
View File

@@ -69,14 +69,14 @@ static const NIVariable _niv_vehicles[] = {
};
class NIHVehicle : public NIHelper {
bool IsInspectable(uint index) const { return Vehicle::Get(index)->GetGRF() != NULL; }
uint GetParent(uint index) const { const Vehicle *first = Vehicle::Get(index)->First(); return GetInspectWindowNumber(GetGrfSpecFeature(first->type), first->index); }
const void *GetInstance(uint index)const { return Vehicle::Get(index); }
const void *GetSpec(uint index) const { return Vehicle::Get(index)->GetEngine(); }
void SetStringParameters(uint index) const { this->SetSimpleStringParameters(STR_VEHICLE_NAME, index); }
uint32 GetGRFID(uint index) const { return Vehicle::Get(index)->GetGRFID(); }
bool IsInspectable(uint index) const override { return Vehicle::Get(index)->GetGRF() != NULL; }
uint GetParent(uint index) const override { const Vehicle *first = Vehicle::Get(index)->First(); return GetInspectWindowNumber(GetGrfSpecFeature(first->type), first->index); }
const void *GetInstance(uint index)const override { return Vehicle::Get(index); }
const void *GetSpec(uint index) const override { return Vehicle::Get(index)->GetEngine(); }
void SetStringParameters(uint index) const override { this->SetSimpleStringParameters(STR_VEHICLE_NAME, index); }
uint32 GetGRFID(uint index) const override { return Vehicle::Get(index)->GetGRFID(); }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
Vehicle *v = Vehicle::Get(index);
VehicleResolverObject ro(v->engine_type, v, VehicleResolverObject::WO_CACHED);
@@ -132,14 +132,14 @@ static const NIVariable _niv_stations[] = {
};
class NIHStation : public NIHelper {
bool IsInspectable(uint index) const { return GetStationSpec(index) != NULL; }
uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Station::GetByTile(index)->town->index); }
const void *GetInstance(uint index)const { return NULL; }
const void *GetSpec(uint index) const { return GetStationSpec(index); }
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_STATION_NAME, GetStationIndex(index), index); }
uint32 GetGRFID(uint index) const { return (this->IsInspectable(index)) ? GetStationSpec(index)->grf_prop.grffile->grfid : 0; }
bool IsInspectable(uint index) const override { return GetStationSpec(index) != NULL; }
uint GetParent(uint index) const override { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Station::GetByTile(index)->town->index); }
const void *GetInstance(uint index)const override { return NULL; }
const void *GetSpec(uint index) const override { return GetStationSpec(index); }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_STATION_NAME, GetStationIndex(index), index); }
uint32 GetGRFID(uint index) const override { return (this->IsInspectable(index)) ? GetStationSpec(index)->grf_prop.grffile->grfid : 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
StationResolverObject ro(GetStationSpec(index), Station::GetByTile(index), index);
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
@@ -197,14 +197,14 @@ static const NIVariable _niv_house[] = {
};
class NIHHouse : public NIHelper {
bool IsInspectable(uint index) const { return HouseSpec::Get(GetHouseType(index))->grf_prop.grffile != NULL; }
uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_FAKE_TOWNS, GetTownIndex(index)); }
const void *GetInstance(uint index)const { return NULL; }
const void *GetSpec(uint index) const { return HouseSpec::Get(GetHouseType(index)); }
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_TOWN_NAME, GetTownIndex(index), index); }
uint32 GetGRFID(uint index) const { return (this->IsInspectable(index)) ? HouseSpec::Get(GetHouseType(index))->grf_prop.grffile->grfid : 0; }
bool IsInspectable(uint index) const override { return HouseSpec::Get(GetHouseType(index))->grf_prop.grffile != NULL; }
uint GetParent(uint index) const override { return GetInspectWindowNumber(GSF_FAKE_TOWNS, GetTownIndex(index)); }
const void *GetInstance(uint index)const override { return NULL; }
const void *GetSpec(uint index) const override { return HouseSpec::Get(GetHouseType(index)); }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_TOWN_NAME, GetTownIndex(index), index); }
uint32 GetGRFID(uint index) const override { return (this->IsInspectable(index)) ? HouseSpec::Get(GetHouseType(index))->grf_prop.grffile->grfid : 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
HouseResolverObject ro(GetHouseType(index), index, Town::GetByTile(index));
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
@@ -247,14 +247,14 @@ static const NIVariable _niv_industrytiles[] = {
};
class NIHIndustryTile : public NIHelper {
bool IsInspectable(uint index) const { return GetIndustryTileSpec(GetIndustryGfx(index))->grf_prop.grffile != NULL; }
uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_INDUSTRIES, GetIndustryIndex(index)); }
const void *GetInstance(uint index)const { return NULL; }
const void *GetSpec(uint index) const { return GetIndustryTileSpec(GetIndustryGfx(index)); }
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_INDUSTRY_NAME, GetIndustryIndex(index), index); }
uint32 GetGRFID(uint index) const { return (this->IsInspectable(index)) ? GetIndustryTileSpec(GetIndustryGfx(index))->grf_prop.grffile->grfid : 0; }
bool IsInspectable(uint index) const override { return GetIndustryTileSpec(GetIndustryGfx(index))->grf_prop.grffile != NULL; }
uint GetParent(uint index) const override { return GetInspectWindowNumber(GSF_INDUSTRIES, GetIndustryIndex(index)); }
const void *GetInstance(uint index)const override { return NULL; }
const void *GetSpec(uint index) const override { return GetIndustryTileSpec(GetIndustryGfx(index)); }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_INDUSTRY_NAME, GetIndustryIndex(index), index); }
uint32 GetGRFID(uint index) const override { return (this->IsInspectable(index)) ? GetIndustryTileSpec(GetIndustryGfx(index))->grf_prop.grffile->grfid : 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
IndustryTileResolverObject ro(GetIndustryGfx(index), index, Industry::GetByTile(index));
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
@@ -346,23 +346,23 @@ static const NIVariable _niv_industries[] = {
};
class NIHIndustry : public NIHelper {
bool IsInspectable(uint index) const { return GetIndustrySpec(Industry::Get(index)->type)->grf_prop.grffile != NULL; }
uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Industry::Get(index)->town->index); }
const void *GetInstance(uint index)const { return Industry::Get(index); }
const void *GetSpec(uint index) const { return GetIndustrySpec(Industry::Get(index)->type); }
void SetStringParameters(uint index) const { this->SetSimpleStringParameters(STR_INDUSTRY_NAME, index); }
uint32 GetGRFID(uint index) const { return (this->IsInspectable(index)) ? GetIndustrySpec(Industry::Get(index)->type)->grf_prop.grffile->grfid : 0; }
bool IsInspectable(uint index) const override { return GetIndustrySpec(Industry::Get(index)->type)->grf_prop.grffile != NULL; }
uint GetParent(uint index) const override { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Industry::Get(index)->town->index); }
const void *GetInstance(uint index)const override { return Industry::Get(index); }
const void *GetSpec(uint index) const override { return GetIndustrySpec(Industry::Get(index)->type); }
void SetStringParameters(uint index) const override { this->SetSimpleStringParameters(STR_INDUSTRY_NAME, index); }
uint32 GetGRFID(uint index) const override { return (this->IsInspectable(index)) ? GetIndustrySpec(Industry::Get(index)->type)->grf_prop.grffile->grfid : 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
Industry *i = Industry::Get(index);
IndustriesResolverObject ro(i->location.tile, i, i->type);
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
}
uint GetPSASize(uint index, uint32 grfid) const { return cpp_lengthof(PersistentStorage, storage); }
uint GetPSASize(uint index, uint32 grfid) const override { return cpp_lengthof(PersistentStorage, storage); }
const int32 *GetPSAFirstPosition(uint index, uint32 grfid) const
const int32 *GetPSAFirstPosition(uint index, uint32 grfid) const override
{
const Industry *i = (const Industry *)this->GetInstance(index);
if (i->psa == NULL) return NULL;
@@ -411,14 +411,14 @@ static const NIVariable _niv_objects[] = {
};
class NIHObject : public NIHelper {
bool IsInspectable(uint index) const { return ObjectSpec::GetByTile(index)->grf_prop.grffile != NULL; }
uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Object::GetByTile(index)->town->index); }
const void *GetInstance(uint index)const { return Object::GetByTile(index); }
const void *GetSpec(uint index) const { return ObjectSpec::GetByTile(index); }
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT, INVALID_STRING_ID, index); }
uint32 GetGRFID(uint index) const { return (this->IsInspectable(index)) ? ObjectSpec::GetByTile(index)->grf_prop.grffile->grfid : 0; }
bool IsInspectable(uint index) const override { return ObjectSpec::GetByTile(index)->grf_prop.grffile != NULL; }
uint GetParent(uint index) const override { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Object::GetByTile(index)->town->index); }
const void *GetInstance(uint index)const override { return Object::GetByTile(index); }
const void *GetSpec(uint index) const override { return ObjectSpec::GetByTile(index); }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT, INVALID_STRING_ID, index); }
uint32 GetGRFID(uint index) const override { return (this->IsInspectable(index)) ? ObjectSpec::GetByTile(index)->grf_prop.grffile->grfid : 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
ObjectResolverObject ro(ObjectSpec::GetByTile(index), Object::GetByTile(index), index);
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
@@ -445,14 +445,14 @@ static const NIVariable _niv_railtypes[] = {
};
class NIHRailType : public NIHelper {
bool IsInspectable(uint index) const { return true; }
uint GetParent(uint index) const { return UINT32_MAX; }
const void *GetInstance(uint index)const { return NULL; }
const void *GetSpec(uint index) const { return NULL; }
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE, INVALID_STRING_ID, index); }
uint32 GetGRFID(uint index) const { return 0; }
bool IsInspectable(uint index) const override { return true; }
uint GetParent(uint index) const override { return UINT32_MAX; }
const void *GetInstance(uint index)const override { return NULL; }
const void *GetSpec(uint index) const override { return NULL; }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE, INVALID_STRING_ID, index); }
uint32 GetGRFID(uint index) const override { return 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
/* There is no unique GRFFile for the tile. Multiple GRFs can define different parts of the railtype.
* However, currently the NewGRF Debug GUI does not display variables depending on the GRF (like 0x7F) anyway. */
@@ -481,14 +481,14 @@ static const NICallback _nic_airporttiles[] = {
};
class NIHAirportTile : public NIHelper {
bool IsInspectable(uint index) const { return AirportTileSpec::Get(GetAirportGfx(index))->grf_prop.grffile != NULL; }
uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Station::GetByTile(index)->town->index); }
const void *GetInstance(uint index)const { return NULL; }
const void *GetSpec(uint index) const { return AirportTileSpec::Get(GetAirportGfx(index)); }
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_STATION_NAME, GetStationIndex(index), index); }
uint32 GetGRFID(uint index) const { return (this->IsInspectable(index)) ? AirportTileSpec::Get(GetAirportGfx(index))->grf_prop.grffile->grfid : 0; }
bool IsInspectable(uint index) const override { return AirportTileSpec::Get(GetAirportGfx(index))->grf_prop.grffile != NULL; }
uint GetParent(uint index) const override { return GetInspectWindowNumber(GSF_FAKE_TOWNS, Station::GetByTile(index)->town->index); }
const void *GetInstance(uint index)const override { return NULL; }
const void *GetSpec(uint index) const override { return AirportTileSpec::Get(GetAirportGfx(index)); }
void SetStringParameters(uint index) const override { this->SetObjectAtStringParameters(STR_STATION_NAME, GetStationIndex(index), index); }
uint32 GetGRFID(uint index) const override { return (this->IsInspectable(index)) ? AirportTileSpec::Get(GetAirportGfx(index))->grf_prop.grffile->grfid : 0; }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
AirportTileResolverObject ro(AirportTileSpec::GetByTile(index), index, Station::GetByTile(index));
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
@@ -519,22 +519,22 @@ static const NIVariable _niv_towns[] = {
};
class NIHTown : public NIHelper {
bool IsInspectable(uint index) const { return Town::IsValidID(index); }
uint GetParent(uint index) const { return UINT32_MAX; }
const void *GetInstance(uint index)const { return Town::Get(index); }
const void *GetSpec(uint index) const { return NULL; }
void SetStringParameters(uint index) const { this->SetSimpleStringParameters(STR_TOWN_NAME, index); }
uint32 GetGRFID(uint index) const { return 0; }
bool PSAWithParameter() const { return true; }
uint GetPSASize(uint index, uint32 grfid) const { return cpp_lengthof(PersistentStorage, storage); }
bool IsInspectable(uint index) const override { return Town::IsValidID(index); }
uint GetParent(uint index) const override { return UINT32_MAX; }
const void *GetInstance(uint index)const override { return Town::Get(index); }
const void *GetSpec(uint index) const override { return NULL; }
void SetStringParameters(uint index) const override { this->SetSimpleStringParameters(STR_TOWN_NAME, index); }
uint32 GetGRFID(uint index) const override { return 0; }
bool PSAWithParameter() const override { return true; }
uint GetPSASize(uint index, uint32 grfid) const override { return cpp_lengthof(PersistentStorage, storage); }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
uint Resolve(uint index, uint var, uint param, bool *avail) const override
{
TownResolverObject ro(NULL, Town::Get(index), true);
return ro.GetScope(VSG_SCOPE_SELF)->GetVariable(var, param, avail);
}
const int32 *GetPSAFirstPosition(uint index, uint32 grfid) const
const int32 *GetPSAFirstPosition(uint index, uint32 grfid) const override
{
Town *t = Town::Get(index);

116
src/table/settings.ini
View File

@@ -44,12 +44,11 @@ static bool ZoomMinMaxChanged(int32 p1);
static bool MaxVehiclesChanged(int32 p1);
static bool InvalidateShipPathCache(int32 p1);
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1);
static bool UpdateServerPassword(int32 p1);
static bool UpdateRconPassword(int32 p1);
static bool UpdateClientConfigValues(int32 p1);
#endif /* ENABLE_NETWORK */
/* End - Callback Functions for the various settings */
/* Some settings do not need to be synchronised when playing in multiplayer.
@@ -618,6 +617,21 @@ def = true
str = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
[SDT_VAR]
base = GameSettings
var = economy.town_cargogen_mode
type = SLE_UINT8
from = SLV_TOWN_CARGOGEN
guiflags = SGF_MULTISTRING
def = TCGM_BITCOUNT
min = TCGM_BEGIN
max = TCGM_END - 1
interval = 1
str = STR_CONFIG_SETTING_TOWN_CARGOGENMODE
strhelp = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT
strval = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL
cat = SC_ADVANCED
; link graph
[SDT_VAR]
@@ -938,12 +952,12 @@ type = SLE_UINT8
from = SLV_87
guiflags = SGF_MULTISTRING
def = 2
min = 0
min = 1
max = 2
interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS
strhelp = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT
strval = STR_CONFIG_SETTING_PATHFINDER_OPF
strval = STR_CONFIG_SETTING_PATHFINDER_NPF
proc = InvalidateShipPathCache
cat = SC_EXPERT
@@ -1204,6 +1218,15 @@ strhelp = STR_CONFIG_SETTING_CATCHMENT_HELPTEXT
proc = StationCatchmentChanged
cat = SC_EXPERT
[SDT_BOOL]
base = GameSettings
var = station.serve_neutral_industries
def = true
from = SLV_SERVE_NEUTRAL_INDUSTRIES
str = STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES
strhelp = STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT
proc = StationCatchmentChanged
[SDT_BOOL]
base = GameSettings
var = order.gradual_loading
@@ -1524,7 +1547,7 @@ type = SLE_UINT32
from = SLV_107
guiflags = SGF_NEWGAME_ONLY
def = 10000
min = 5000
min = 500
max = 250000
interval = 2500
str = STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES
@@ -1646,23 +1669,10 @@ max = 255
cat = SC_EXPERT
##
[SDT_VAR]
base = GameSettings
var = pf.opf.pf_maxlength
type = SLE_UINT16
def = 4096
min = 64
max = 65535
cat = SC_EXPERT
[SDT_VAR]
base = GameSettings
var = pf.opf.pf_maxdepth
type = SLE_UINT8
def = 48
min = 4
max = 255
cat = SC_EXPERT
; Used to be pf.opf.pf_maxlength & pf.opf.pf_maxdepth
[SDT_NULL]
length = 3
to = SLV_REMOVE_OPF
##
[SDT_VAR]
@@ -2148,6 +2158,26 @@ min = 0
max = 1000000
cat = SC_EXPERT
[SDT_VAR]
base = GameSettings
var = pf.yapf.ship_curve45_penalty
type = SLE_UINT
from = SLV_SHIP_CURVE_PENALTY
def = 1 * YAPF_TILE_LENGTH
min = 0
max = 1000000
cat = SC_EXPERT
[SDT_VAR]
base = GameSettings
var = pf.yapf.ship_curve90_penalty
type = SLE_UINT
from = SLV_SHIP_CURVE_PENALTY
def = 6 * YAPF_TILE_LENGTH
min = 0
max = 1000000
cat = SC_EXPERT
##
[SDT_VAR]
base = GameSettings
@@ -3534,7 +3564,6 @@ strhelp = STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION_HELPTEXT
strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = gui.network_chat_box_width_pct
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3544,7 +3573,6 @@ max = 100
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = gui.network_chat_box_height
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3554,7 +3582,6 @@ max = 255
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = gui.network_chat_timeout
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3564,7 +3591,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.sync_freq
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
@@ -3575,7 +3601,6 @@ max = 100
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.frame_freq
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
@@ -3586,7 +3611,6 @@ max = 100
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.commands_per_frame
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3597,7 +3621,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_commands_in_queue
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3608,7 +3631,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.bytes_per_frame
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3619,7 +3641,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.bytes_per_frame_burst
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3630,7 +3651,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_init_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3641,7 +3661,6 @@ max = 32000
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_join_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3651,7 +3670,6 @@ min = 0
max = 32000
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_download_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3661,7 +3679,6 @@ min = 0
max = 32000
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_password_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3671,7 +3688,6 @@ min = 0
max = 32000
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_lag_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3681,14 +3697,12 @@ min = 0
max = 32000
[SDTC_BOOL]
ifdef = ENABLE_NETWORK
var = network.pause_on_join
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
def = true
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.server_port
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3699,7 +3713,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.server_admin_port
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3710,7 +3723,6 @@ max = 65535
cat = SC_EXPERT
[SDTC_BOOL]
ifdef = ENABLE_NETWORK
var = network.server_admin_chat
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
@@ -3718,14 +3730,12 @@ def = true
cat = SC_EXPERT
[SDTC_BOOL]
ifdef = ENABLE_NETWORK
var = network.server_advertise
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
def = false
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.lan_internet
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3735,7 +3745,6 @@ min = 0
max = 1
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.client_name
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3744,7 +3753,6 @@ proc = UpdateClientName
cat = SC_BASIC
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.server_password
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3754,7 +3762,6 @@ proc = UpdateServerPassword
cat = SC_BASIC
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.rcon_password
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3764,7 +3771,6 @@ proc = UpdateRconPassword
cat = SC_BASIC
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.admin_password
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3773,14 +3779,12 @@ def = NULL
cat = SC_BASIC
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.default_company_pass
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = NULL
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.server_name
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3789,14 +3793,12 @@ def = NULL
cat = SC_BASIC
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.connect_to_ip
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = NULL
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.network_id
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3804,14 +3806,12 @@ guiflags = SGF_NETWORK_ONLY
def = NULL
[SDTC_BOOL]
ifdef = ENABLE_NETWORK
var = network.autoclean_companies
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
def = false
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.autoclean_unprotected
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3821,7 +3821,6 @@ min = 0
max = 240
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.autoclean_protected
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3831,7 +3830,6 @@ min = 0
max = 240
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.autoclean_novehicles
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3841,7 +3839,6 @@ min = 0
max = 240
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_companies
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3853,7 +3850,6 @@ proc = UpdateClientConfigValues
cat = SC_BASIC
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_clients
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3864,7 +3860,6 @@ max = MAX_CLIENTS
cat = SC_BASIC
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.max_spectators
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3876,7 +3871,6 @@ proc = UpdateClientConfigValues
cat = SC_BASIC
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.restart_game_year
type = SLE_INT32
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3887,7 +3881,6 @@ max = MAX_YEAR
interval = 1
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.min_active_clients
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3897,7 +3890,6 @@ min = 0
max = MAX_CLIENTS
[SDTC_OMANY]
ifdef = ENABLE_NETWORK
var = network.server_lang
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3908,7 +3900,6 @@ full = _server_langs
cat = SC_BASIC
[SDTC_BOOL]
ifdef = ENABLE_NETWORK
var = network.reload_cfg
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
@@ -3916,7 +3907,6 @@ def = false
cat = SC_EXPERT
[SDTC_STR]
ifdef = ENABLE_NETWORK
var = network.last_host
type = SLE_STRB
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3924,7 +3914,6 @@ def = """"
cat = SC_EXPERT
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = network.last_port
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -3934,7 +3923,6 @@ max = UINT16_MAX
cat = SC_EXPERT
[SDTC_BOOL]
ifdef = ENABLE_NETWORK
var = network.no_http_content_downloads
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false

6
src/table/sprites.h
View File

@@ -402,8 +402,11 @@ static const SpriteID SPR_MONO_SINGLE_SOUTH = 1090;
static const SpriteID SPR_MONO_SINGLE_EAST = 1091;
static const SpriteID SPR_MONO_SINGLE_WEST = 1092;
static const SpriteID SPR_MONO_TRACK_Y = 1093;
static const SpriteID SPR_MONO_TRACK_X = 1094;
static const SpriteID SPR_MONO_TRACK_BASE = 1100;
static const SpriteID SPR_MONO_TRACK_N_S = 1117;
static const SpriteID SPR_MONO_TRACK_Y_SNOW = 1119;
static const SpriteID SPR_MONO_TRACK_X_SNOW = 1120;
static const SpriteID SPR_MGLV_SINGLE_X = 1169;
static const SpriteID SPR_MGLV_SINGLE_Y = 1170;
static const SpriteID SPR_MGLV_SINGLE_NORTH = 1171;
@@ -411,7 +414,10 @@ static const SpriteID SPR_MGLV_SINGLE_SOUTH = 1172;
static const SpriteID SPR_MGLV_SINGLE_EAST = 1173;
static const SpriteID SPR_MGLV_SINGLE_WEST = 1174;
static const SpriteID SPR_MGLV_TRACK_Y = 1175;
static const SpriteID SPR_MGLV_TRACK_X = 1176;
static const SpriteID SPR_MGLV_TRACK_BASE = 1182;
static const SpriteID SPR_MGLV_TRACK_Y_SNOW = 1184;
static const SpriteID SPR_MGLV_TRACK_X_SNOW = 1185;
static const SpriteID SPR_MGLV_TRACK_N_S = 1199;
static const SpriteID SPR_WAYPOINT_X_1 = SPR_OPENTTD_BASE + 78;
static const SpriteID SPR_WAYPOINT_X_2 = SPR_OPENTTD_BASE + 79;

86
src/table/townname.h
View File

@@ -649,7 +649,7 @@ static const char * const _name_spanish_real[] = {
"San Carlos",
"El Lim\xC3\xB3n",
"Coro",
"Corocoro",
"Coro Coro",
"Puerto Ayacucho",
"Elorza",
"Arismendi",
@@ -672,7 +672,7 @@ static const char * const _name_spanish_real[] = {
"Ibarra",
"San Lorenzo",
"Macas",
"Morana",
"Mora\xC3\xB1""a",
"Machala",
"Zamora",
"Latacunga",
@@ -2040,28 +2040,28 @@ static const char * const _name_romanian_real[] = {
static const char * const _name_slovak_real[] = {
"Bratislava",
"Banovce nad Bebravou",
"B\xC3\xA1novce nad Bebravou",
"Bansk\xC3\xA1 Bystrica",
"Bansk\xC3\xA1 \xC5\xA0tiavnica",
"Bardejov",
"Brezno",
"Brezova pod Bradlom",
"Bytca",
"Cadca",
"Cierna nad Tisou",
"Byt\xC4\x8D""a",
"\xC4\x8C""adca",
"\xC4\x8Cierna nad Tisou",
"Detva",
"Pre\xC5\xA1ov",
"Dolny Kubin",
"Spi\xC5\xA1sk\xC3\xA1 Nov\xC3\xA1 Ves",
"Dunajska Streda",
"Gabcikovo",
"Dunajsk\xC3\xA1 Streda",
"Gab\xC4\x8D\xC3\xADikovo",
"Galanta",
"Gbely",
"Gelnica",
"Handlova",
"Handlov\xC3\xA1",
"Hlohovec",
"Holic",
"Humenne",
"Hol\xC3\xAD\xC4\x8D",
"Humenn\xC3\xA9",
"Hurbanovo",
"Kezmarok",
"Kom\xC3\xA1rno",
@@ -2070,61 +2070,61 @@ static const char * const _name_slovak_real[] = {
"Krompachy",
"Kuty",
"Leopoldov",
"Levoca",
"Liptovsky Mikulas",
"Lucenec",
"Levo\xC4\x8D""a",
"Liptovsk\xC3\xBD Mikul\xC3\xA1\xC5\xA1",
"Lu\xC4\x8D""enec",
"Malacky",
"Martin",
"Medzilaborce",
"Michalovce",
"Modra",
"Myjava",
"Namestovo",
"N\xC3\xA1mestovo",
"Nitra",
"Nov\xC3\xA1 Ba\xC5\x88""a",
"Nov\xC3\xA9"" Mesto nad V\xC3\xA1hom",
"Nov\xC3\xA9"" Z\xC3\xA1""mky",
"Partizanske",
"Partiz\xC3\xA1nske",
"Pezinok",
"Piestany",
"Poltar",
"Pie\xC5\xA1\xC5\xA5""any",
"Polt\xC3\xA1r",
"Poprad",
"Pova\xC5\xBEsk\xC3\xA1 Bystrica",
"Prievidza",
"Puchov",
"Revuca",
"Rimavska Sobota",
"Roznava",
"Ruzomberok",
"P\xC3\xBA""chov",
"Rev\xC3\xBA""ca",
"Rimavsk\xC3\xA1 Sobota",
"Ro\xC5\xBE\xC5\x88""ava",
"Ru\xC5\xBEomberok",
"Sabinov",
"Sala",
"\xC5\xA0""a\xC4\xBE""a",
"Senec",
"Senica",
"Sered",
"Sere\xC4\x8F",
"Skalica",
"Sladkovicovo",
"Sl\xC3\xA1""dkovi\xC3\x8Dovo",
"Smolenice",
"Snina",
"Stara Lubovna",
"Stara Tura",
"Strazske",
"Star\xC3\xA1 \xC4\xBDubov\xC5\x88""a",
"Star\xC3\xA1 Tur\xC3\xA1",
"Str\xC3\xA1\xC5\xBEske",
"Stropkov",
"Stupava",
"Sturovo",
"Sulekovo",
"Topolcany",
"Trebisov",
"Trencin",
"\xC5\xA0t\xC3\xBArovo",
"\xC4\xA0ulekovo",
"Topo\xC4\xBE\xC4\x8D""any",
"Trebi\xC5\xA1ov",
"Tren\xC4\x8D\xC3\xADn",
"Trnava",
"Turcianske Teplice",
"Tvrdosin",
"Vrable",
"Vranov nad Toplou",
"Zahorska Bystrica",
"Zdiar",
"Ziar nad Hronom",
"Tur\xC4\x8Dianske Teplice",
"Tvrdo\xC5\xA1\xC3\xADn",
"Vr\xC3\xA1""ble",
"Vranov nad Top\xC4\xBEou",
"Z\xC3\xA1horsk\xC3\xA1 Bystrica",
"\xC5\xBD""diar",
"\xC4\xBDiar nad Hronom",
"\xC5\xBDilina",
"Zlate Moravce",
"Zlat\xC3\xA9 Moravce",
"Zvolen",
};
@@ -2838,7 +2838,7 @@ static const char * const _name_turkish_real[] = {
"Edirne",
"Elaz\xC4\xB1\xC4\x9F",
"Erzurum",
"Eskisehir",
"Eski\xC5\x9F""ehir",
"Giresun",
"G\xC3\xBCm\xC3\xBC\xC5\x9Fhane",
"Hatay",