mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r15212) -Feature [FS#2566]: Change the dropdown box where you can chose which edges will be water to 4 pushbuttons (based on patch by planetmaker).

This commit is contained in:
Yexo 2009-01-23 00:18:27 +00:00
parent 3852ae1264
commit 08670da54a
19 changed files with 98 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/genworld_gui.cpp
View File

@ -99,13 +99,23 @@ enum GenerateLandscapeWindowWidgets {
GLAND_WATER_PULLDOWN,
GLAND_SMOOTHNESS_TEXT,
GLAND_SMOOTHNESS_PULLDOWN,
GLAND_WATER_BORDERS_PULLDOWN,
GLAND_BORDER_TYPES,
GLAND_BORDERS_RANDOM,
GLAND_WATER_NW_TEXT,
GLAND_WATER_NE_TEXT,
GLAND_WATER_SE_TEXT,
GLAND_WATER_SW_TEXT,
GLAND_WATER_NW,
GLAND_WATER_NE,
GLAND_WATER_SE,
GLAND_WATER_SW,
};
static const Widget _generate_landscape_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, COLOUR_BROWN, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, COLOUR_BROWN, 0, 337, 14, 285, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, COLOUR_BROWN, 0, 337, 14, 313, 0x0, STR_NULL},
/* Landscape selection */
{ WWT_IMGBTN_2, RESIZE_NONE, COLOUR_ORANGE, 10, 86, 24, 78, SPR_SELECT_TEMPERATE, STR_030E_SELECT_TEMPERATE_LANDSCAPE}, // GLAND_TEMPERATE
@ -165,11 +175,20 @@ static const Widget _generate_landscape_widgets[] = {
{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 228, 239, 0x0, STR_NULL}, // GLAND_WATER_PULLDOWN
/* Map smoothness */
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 110, 245, 257, STR_SMOOTHNESS, STR_NULL}, // GLAND_SMOOTHNESS_TEXT
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 110, 247, 257, STR_SMOOTHNESS, STR_NULL}, // GLAND_SMOOTHNESS_TEXT
{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 246, 257, 0x0, STR_NULL}, // GLAND_SMOOTHNESS_PULLDOWN
/* Water borders */
{ WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 12, 326, 264, 275, 0x0, STR_NULL}, // GLAND_WATER_BORDERS_PULLDOWN
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 110, 265, 275, STR_BORDER_TYPE, STR_NULL}, // GLAND_BORDER_TYPES
{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 264, 275, STR_BORDER_RANDOMIZE, STR_NULL}, // GLAND_BORDERS_RANDOM
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 95, 282, 292, STR_NORTHWEST, STR_NULL}, // GLAND_WATER_NW_TEXT
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 250, 326, 282, 292, STR_NORTHEAST, STR_NULL}, // GLAND_WATER_NE_TEXT
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 250, 326, 294, 304, STR_SOUTHEAST, STR_NULL}, // GLAND_WATER_SE_TEXT
{ WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 12, 95, 294, 304, STR_SOUTHWEST, STR_NULL}, // GLAND_WATER_SW_TEXT
{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 100, 172, 280, 291, 0x0, STR_NORTHWEST}, // GLAND_WATER_NW
{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 173, 245, 280, 291, 0x0, STR_NORTHEAST}, // GLAND_WATER_NE
{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 173, 245, 292, 303, 0x0, STR_SOUTHEAST}, // GLAND_WATER_SE
{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 100, 172, 292, 303, 0x0, STR_SOUTHWEST}, // GLAND_WATER_SW
{ WIDGETS_END},
};
@ -273,25 +292,6 @@ static const StringID _rotation[] = {STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CO
static const StringID _landscape[] = {STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL, STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS, INVALID_STRING_ID};
static const StringID _num_towns[] = {STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
static const StringID _num_inds[] = {STR_NONE, STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
static const StringID _water_borders[] = {
STR_CONFIG_PATCHES_WATER_BORDER_NONE,
STR_CONFIG_PATCHES_WATER_BORDER_NE,
STR_CONFIG_PATCHES_WATER_BORDER_SE,
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE,
STR_CONFIG_PATCHES_WATER_BORDER_SW,
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE,
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE,
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE,
STR_CONFIG_PATCHES_WATER_BORDER_NW,
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE,
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE,
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE,
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW,
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE,
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE,
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE,
INVALID_STRING_ID
};
struct GenerateLandscapeWindow : public QueryStringBaseWindow {
uint widget_id;
@ -311,6 +311,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
this->afilter = CS_NUMERAL;
this->mode = (glwp_modes)this->window_number;
if (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) _settings_newgame.game_creation.water_borders = GB(Random(), 0, 4);
this->FindWindowPlacementAndResize(desc);
}
@ -320,7 +321,9 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
/* You can't select smoothness / non-water borders if not terragenesis */
if (mode == GLWP_GENERATE) {
this->SetWidgetDisabledState(GLAND_SMOOTHNESS_PULLDOWN, _settings_newgame.game_creation.land_generator == 0);
this->SetWidgetDisabledState(GLAND_WATER_BORDERS_PULLDOWN, _settings_newgame.game_creation.land_generator == 0 || !_settings_newgame.construction.freeform_edges);
this->SetWidgetDisabledState(GLAND_BORDERS_RANDOM, _settings_newgame.game_creation.land_generator == 0 || !_settings_newgame.construction.freeform_edges);
this->SetWidgetsDisabledState(_settings_newgame.game_creation.land_generator == 0 || !_settings_newgame.construction.freeform_edges || _settings_newgame.game_creation.water_borders == BORDERS_RANDOM,
GLAND_WATER_NW, GLAND_WATER_NE, GLAND_WATER_SE, GLAND_WATER_SW, WIDGET_LIST_END);
}
/* Disable snowline if not hilly */
this->SetWidgetDisabledState(GLAND_SNOW_LEVEL_TEXT, _settings_newgame.game_creation.landscape != LT_ARCTIC);
@ -339,6 +342,13 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
this->SetWidgetLoweredState(GLAND_TROPICAL, _settings_newgame.game_creation.landscape == LT_TROPIC);
this->SetWidgetLoweredState(GLAND_TOYLAND, _settings_newgame.game_creation.landscape == LT_TOYLAND);
this->SetWidgetLoweredState(GLAND_BORDERS_RANDOM, _settings_newgame.game_creation.water_borders == BORDERS_RANDOM);
this->SetWidgetLoweredState(GLAND_WATER_NW, HasBit(_settings_newgame.game_creation.water_borders, BORDER_NW));
this->SetWidgetLoweredState(GLAND_WATER_NE, HasBit(_settings_newgame.game_creation.water_borders, BORDER_NE));
this->SetWidgetLoweredState(GLAND_WATER_SE, HasBit(_settings_newgame.game_creation.water_borders, BORDER_SE));
this->SetWidgetLoweredState(GLAND_WATER_SW, HasBit(_settings_newgame.game_creation.water_borders, BORDER_SW));
if (_game_mode == GM_EDITOR) {
this->widget[GLAND_TOWN_PULLDOWN].data = STR_6836_OFF;
this->widget[GLAND_INDUSTRY_PULLDOWN].data = STR_6836_OFF;
@ -348,12 +358,24 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
}
if (mode == GLWP_GENERATE) {
this->widget[GLAND_LANDSCAPE_PULLDOWN].data = _landscape[_settings_newgame.game_creation.land_generator];
this->widget[GLAND_TREE_PULLDOWN].data = _tree_placer[_settings_newgame.game_creation.tree_placer];
this->widget[GLAND_TERRAIN_PULLDOWN].data = _elevations[_settings_newgame.difficulty.terrain_type];
this->widget[GLAND_WATER_PULLDOWN].data = _sea_lakes[_settings_newgame.difficulty.quantity_sea_lakes];
this->widget[GLAND_SMOOTHNESS_PULLDOWN].data = _smoothness[_settings_newgame.game_creation.tgen_smoothness];
this->widget[GLAND_WATER_BORDERS_PULLDOWN].data = _settings_newgame.construction.freeform_edges ? _water_borders[_settings_newgame.game_creation.water_borders] : STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE;
this->widget[GLAND_LANDSCAPE_PULLDOWN].data = _landscape[_settings_newgame.game_creation.land_generator];
this->widget[GLAND_TREE_PULLDOWN].data = _tree_placer[_settings_newgame.game_creation.tree_placer];
this->widget[GLAND_TERRAIN_PULLDOWN].data = _elevations[_settings_newgame.difficulty.terrain_type];
this->widget[GLAND_WATER_PULLDOWN].data = _sea_lakes[_settings_newgame.difficulty.quantity_sea_lakes];
this->widget[GLAND_SMOOTHNESS_PULLDOWN].data = _smoothness[_settings_newgame.game_creation.tgen_smoothness];
this->widget[GLAND_BORDERS_RANDOM].data = (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? STR_BORDER_RANDOMIZE : STR_BORDER_MANUAL;
if (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) {
this->widget[GLAND_WATER_NE].data = STR_BORDER_RANDOM;
this->widget[GLAND_WATER_NW].data = STR_BORDER_RANDOM;
this->widget[GLAND_WATER_SE].data = STR_BORDER_RANDOM;
this->widget[GLAND_WATER_SW].data = STR_BORDER_RANDOM;
} else {
this->widget[GLAND_WATER_NE].data = HasBit(_settings_newgame.game_creation.water_borders,BORDER_NE) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
this->widget[GLAND_WATER_NW].data = HasBit(_settings_newgame.game_creation.water_borders,BORDER_NW) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
this->widget[GLAND_WATER_SE].data = HasBit(_settings_newgame.game_creation.water_borders,BORDER_SE) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
this->widget[GLAND_WATER_SW].data = HasBit(_settings_newgame.game_creation.water_borders,BORDER_SW) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
}
} else {
this->widget[GLAND_TREE_PULLDOWN].data = _tree_placer[_settings_newgame.game_creation.tree_placer];
this->widget[GLAND_HEIGHTMAP_ROTATION_PULLDOWN].data = _rotation[_settings_newgame.game_creation.heightmap_rotation];
@ -509,8 +531,26 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
ShowDropDownMenu(this, _smoothness, _settings_newgame.game_creation.tgen_smoothness, GLAND_SMOOTHNESS_PULLDOWN, 0, 0);
break;
case GLAND_WATER_BORDERS_PULLDOWN: // Water borders
ShowDropDownMenu(this, _water_borders, _settings_newgame.game_creation.water_borders, GLAND_WATER_BORDERS_PULLDOWN, 0, 0);
/* Freetype map borders */
case GLAND_WATER_NW:
_settings_newgame.game_creation.water_borders = ToggleBit(_settings_newgame.game_creation.water_borders, BORDER_NW);
break;
case GLAND_WATER_NE:
_settings_newgame.game_creation.water_borders = ToggleBit(_settings_newgame.game_creation.water_borders, BORDER_NE);
break;
case GLAND_WATER_SE:
_settings_newgame.game_creation.water_borders = ToggleBit(_settings_newgame.game_creation.water_borders, BORDER_SE);
break;
case GLAND_WATER_SW:
_settings_newgame.game_creation.water_borders = ToggleBit(_settings_newgame.game_creation.water_borders, BORDER_SW);
break;
case GLAND_BORDERS_RANDOM:
_settings_newgame.game_creation.water_borders = (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? 0 : BORDERS_RANDOM;
this->SetDirty();
break;
}
}
@ -540,7 +580,6 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
case GLAND_MAPSIZE_Y_PULLDOWN: _settings_newgame.game_creation.map_y = index; break;
case GLAND_TREE_PULLDOWN: _settings_newgame.game_creation.tree_placer = index; break;
case GLAND_SMOOTHNESS_PULLDOWN: _settings_newgame.game_creation.tgen_smoothness = index; break;
case GLAND_WATER_BORDERS_PULLDOWN: _settings_newgame.game_creation.water_borders = index; break;
case GLAND_TOWN_PULLDOWN:
_settings_newgame.difficulty.number_towns = index;
@ -601,7 +640,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
};
static const WindowDesc _generate_landscape_desc = {
WDP_CENTER, WDP_CENTER, 338, 286, 338, 286,
WDP_CENTER, WDP_CENTER, 338, 313, 338, 313,
WC_GENERATE_LANDSCAPE, WC_NONE,
WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_generate_landscape_widgets,

11
src/landscape_type.h
View File

@ -17,4 +17,15 @@ enum LandscapeType {
NUM_LANDSCAPE = 4,
};
/**
* For storing the water borders which shall be retained.
*/
enum Borders {
BORDER_NE = 0,
BORDER_SE = 1,
BORDER_SW = 2,
BORDER_NW = 3,
BORDERS_RANDOM = 16,
};
#endif /* LANDSCAPE_TYPE_H */

20
src/lang/catalan.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Activa
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Una o més cel·les al vèrtex nord no està buit
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Una o més cel·les en una de les vores no és aigua
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Terra a totes les vores
STR_CONFIG_PATCHES_WATER_BORDER_NE :Aigua només a la vora nord-est
STR_CONFIG_PATCHES_WATER_BORDER_SE :Aigua només a la vora sud-est
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Aigua a les vores nord-est i sud-est
STR_CONFIG_PATCHES_WATER_BORDER_SW :Aigua només a la vora sud-oest
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Aigua a les vores nord-est i sud-oest
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Aigua a les vores sud-est i sud-oest
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Terra només a la vora nord-oest
STR_CONFIG_PATCHES_WATER_BORDER_NW :Aigua només a la vora nord-oest
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Aigua a les vores nord-oest i nord-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Aigua a les vores sud-oest i sud-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Terra només a la vora sud-oest
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Aigua a les vores nord-oest i sud-oest
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Terra només a la vora sud-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Terra només a la vora nord-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Aigua a totes les vores
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Max extensió de estacions: {ORANGE}{STRING}{RED}Avís: Un valor alt enlenteix el joc
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Manteniment dels helicopters als heliports automàticament: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Enllaça la barra d'eines del paisatge a les barres d'eines de vies/carreteres/aigua/aeroports {ORANGE}{STRING}

20
src/lang/czech.txt
View File

@ -1162,26 +1162,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Umožni
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Alespoň jeden dílek na severním okraji není prázdný
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Alespoň jeden dílek na jednom z okrajů není zaplaven
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Země na všech okrajích
STR_CONFIG_PATCHES_WATER_BORDER_NE :Voda pouze na severovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_SE :Voda pouze na jihovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Voda na severovýchodním a jihovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_SW :Voda pouze na jihozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Voda na severovýchodním a jihozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Voda na jihovýchodním a jihozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Země pouze na severozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW :Voda pouze na severozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Voda na severozápadním a severovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Voda na severozápadním a jihovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Země pouze na jihozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Voda na severozápadním a jihozápadním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Země pouze na jihovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Země pouze na severovýchodním okraji
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Voda na všech okrajích
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Největší rozsah stanice: {ORANGE}{STRING} {RED}Pozor: Vysoké nastavení zpomalí hru
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Údržba vrtulníků na heliportech: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Otevírat lištu na úpravy terénu s lištami na výstavbu tratí/silnic atd.: {ORANGE}{STRING}

20
src/lang/dutch.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Aanpass
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Een of meer vakjes in de in de noordelijke rand zijn niet leeg
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Een of meer vakjes op de rand zijn geen water
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Land op alle randen
STR_CONFIG_PATCHES_WATER_BORDER_NE :Water alleen aan de noordoost rand
STR_CONFIG_PATCHES_WATER_BORDER_SE :Water alleen aan de zuidoost rand
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Water aan de noordoost en zuidoost rand
STR_CONFIG_PATCHES_WATER_BORDER_SW :Water alleen aan de zuidwest rand
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Water aan de noordoost en zuidwest rand
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Water aan de zuioost en zuidwest rand
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Land alleen aan de noordwest rand
STR_CONFIG_PATCHES_WATER_BORDER_NW :Water alleen aan de noordwest rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Water aan de noordwest en noordoost rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Water aan de noordwest en zuidoost rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Land alleen aan de zuidwest rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Water aan de noordwest en zuidwest rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Land alleen aan de zuidoost rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Land alleen aan de noordoost rand
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Water aan alle randen
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Maximale stationsomvang: {ORANGE}{STRING} {RED}Pas op: Hoge waarde vertraagt spel
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Helikopters automatisch repareren op helipads: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Verbind de landschaptoolbar met de trein/weg/water/vliegveld toolbars: {ORANGE}{STRING}

32
src/lang/english.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Enable
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}One or more tiles at the northern edge are not empty
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}One or more tiles at one of the edges is not water
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Land at all borders
STR_CONFIG_PATCHES_WATER_BORDER_NE :Water at north-east border only
STR_CONFIG_PATCHES_WATER_BORDER_SE :Water at south-east border only
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Water at north-east and south-east borders
STR_CONFIG_PATCHES_WATER_BORDER_SW :Water at south-west border only
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Water at north-east and south-west borders
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Water at south-east and south-west borders
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Land only at north-west border
STR_CONFIG_PATCHES_WATER_BORDER_NW :Water at north-west border only
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Water at north-west and north-east borders
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Water at north-west and south-east borders
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Land only at south-west border
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Water at north-west and south-west borders
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Land only at south-east border
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Land only at north-east border
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Water at all borders
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Max station spread: {ORANGE}{STRING1} {RED}Warning: High setting slows game
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Link landscape toolbar to rail/road/water/airport toolbars: {ORANGE}{STRING1}
@ -3510,6 +3490,18 @@ STR_FLAT_WORLD_HEIGHT :{BLACK}Height o
STR_SMALLMAP_CENTER :{BLACK}Center the smallmap on the current position
STR_SMALLMAP_INDUSTRY :{TINYFONT}{STRING} ({NUM})
# Strings for map borders at game generation
STR_BORDER_TYPE :{BLACK}Map edges:
STR_NORTHWEST :{BLACK}Northwest
STR_NORTHEAST :{BLACK}Northeast
STR_SOUTHEAST :{BLACK}Southeast
STR_SOUTHWEST :{BLACK}Southwest
STR_BORDER_FREEFORM :{BLACK}Freeform
STR_BORDER_WATER :{BLACK}Water
STR_BORDER_RANDOM :{BLACK}Random
STR_BORDER_RANDOMIZE :{BLACK}Random
STR_BORDER_MANUAL :{BLACK}Manual
########### String for new airports
STR_SMALL_AIRPORT :{BLACK}Small
STR_CITY_AIRPORT :{BLACK}City

20
src/lang/finnish.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Salli m
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Yksi tai useampi ruutu pohjoisreunalla ei ole tyhjä
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Yksi tai useampi ruutu jollakin reunalla ei ole vettä
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Maata kaikilla reunoilla
STR_CONFIG_PATCHES_WATER_BORDER_NE :Vettä vain koillisreunalla
STR_CONFIG_PATCHES_WATER_BORDER_SE :Vettä vain kaakkoisreunalla
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Vettä koillis- ja kaakkoisreunalla
STR_CONFIG_PATCHES_WATER_BORDER_SW :Vettä vain lounaisreunalla
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Vettä koillis- ja luoteisreunalla
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Vettä kaakkois- ja lounaisreunalla
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Maata vain lounaisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW :Vettä vain lounaisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Vettä vain lounais- ja kaakkoisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Vettä vain lounais- ja koillisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Maata vain luoteisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Vettä vain lounais- ja luoteisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Maata vain koillisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Maata vain lounaisreunassa
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Vettä kaikilla reunoilla
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Suurin aseman levittäytyminen: {ORANGE}{STRING} {RED}Huom: korkea asetus hidastaa peliä
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Huolla helikopterit helikopterialustoilla automaattisesti: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Kiinnitä maastonmuokkauspalkki rakentamistyökalupalkkeihin: {ORANGE}{STRING}

20
src/lang/french.txt
View File

@ -1095,26 +1095,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Autoris
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Une ou plusieurs cases sur le bord nord ne sont pas vides
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Une ou plusieurs cases sur l'un des bords ne sont pas de l'eau
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Terre sur tous les bords
STR_CONFIG_PATCHES_WATER_BORDER_NE :Eau sur le bord nord-est uniquement
STR_CONFIG_PATCHES_WATER_BORDER_SE :Eau sur le bord sud-est uniquement
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Eau sur les bords nord-est et sud-est
STR_CONFIG_PATCHES_WATER_BORDER_SW :Eau sur le bord sud-ouest uniquement
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Eau sur les bords nord-est et sud-ouest
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Eau sur les bords sud-est et sud-ouest
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Terre sur le bord nord-ouest uniquement
STR_CONFIG_PATCHES_WATER_BORDER_NW :Eau sur le bord nord-ouest uniquement
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Eau sur les bords nord-ouest et nord-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Eau sur les bords nord-ouest et sud-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Terre sur le bord sud-ouest uniquement
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Eau sur les bords nord-ouest et sud-ouest
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Terre sur le bord sud-est uniquement
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Terre sur le bord nord-est uniquement
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Eau sur tous les bords
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Etendue max. des stations: {ORANGE}{STRING} {RED}Attention: Valeur élevée = jeu lent
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Entretenir automatiquement les hélicoptères à l'héliport: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Relier la barre d'outils Paysage avec celle des rails/routes/eau et aéroport: {ORANGE}{STRING}

20
src/lang/hungarian.txt
View File

@ -1160,26 +1160,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}A térk
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Az északi határnál egy vagy több mező nem üres
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Az egyik határnál egy vagy több mező nem víz
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Szárazföld minden határnál
STR_CONFIG_PATCHES_WATER_BORDER_NE :Víz csak az északkeleti határnál
STR_CONFIG_PATCHES_WATER_BORDER_SE :Víz csak a délkeleti határnál
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Víz az északkeleti és délkeleti határoknál
STR_CONFIG_PATCHES_WATER_BORDER_SW :Víz csak a délnyugati határnál
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Víz az északkeleti és délnyugati határoknál
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Víz a délkeleti és délnyugati határoknál
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Szárazföld csak az északnyugati határnál
STR_CONFIG_PATCHES_WATER_BORDER_NW :Víz csak az északnyugati határnál
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Víz az északnyugati és északkeleti határoknál
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Víz az északnyugati és délkeleti határoknál
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Szárazföld csak a délnyugati határnál
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Víz az északnyugati és délnyugati határoknál
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Szárazföld csak a délkeleti határnál
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Szárazföld csak az északkeleti határnál
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Víz mindegyik határnál
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Állomások legnagyobb kiterjedése: {ORANGE}{STRING} {RED}Figyelem: magas érték lelassítja a játékot
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Helikopterek automatikus javítása a helikopter-leszállókon: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Tájrendező eszköztár megnyitása az építési eszköztárakkal: {ORANGE}{STRING}

20
src/lang/indonesian.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Ijinkan
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Kotak pada ujung utara tidak kosong
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Kotak pada salah satu ujung peta bukanlah perairan
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Dataran pd semua pinggiran
STR_CONFIG_PATCHES_WATER_BORDER_NE :Perairan hanya di batas timur laut saja
STR_CONFIG_PATCHES_WATER_BORDER_SE :Perairan hanya di batas tenggara saja
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Perairan hanya di batas timur laut dan tenggara
STR_CONFIG_PATCHES_WATER_BORDER_SW :Perairan hanya di batas barat daya saja
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Perairan hanya di batas timur laut dan barat daya saja
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Perairan hanya di batas tenggara dan barat daya saja
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Dataran hanya di batas barat laut saja
STR_CONFIG_PATCHES_WATER_BORDER_NW :Perairan hanya di batas barat laut saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Perairan hanya di batas barat laut dan timur laut saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Perairan hanya di batas barat laut dan tenggara saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Dataran hanya di batas barat daya saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Perairan hanya di batas barat laut dan barat daya saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Dataran hanya di batas tenggara saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Dataran hanya di batas timur laut saja
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Perairan pada semua batas
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Sebaran stasiun maks.: {ORANGE}{STRING} {RED}Peringatan: Makin tinggi, Makin lambat
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Perbaikan helikopter di helipad secara otomatis: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Tempel toolbar Landsekap ke toolbar rel/jalan/air/bandara: {ORANGE}{STRING}

20
src/lang/italian.txt
View File

@ -1095,26 +1095,6 @@ STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Altitud
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Uno o più riquadri sul lato nord non sono vuoti
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Uno o più riquadri su uno dei bordi non sono d'acqua
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Terreno su tutti i bordi
STR_CONFIG_PATCHES_WATER_BORDER_NE :Acqua solo sul bordo nord-est
STR_CONFIG_PATCHES_WATER_BORDER_SE :Acqua solo sul bordo sud-est
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Acqua sui bordi nord-est e sud-est
STR_CONFIG_PATCHES_WATER_BORDER_SW :Acqua solo sul bordo sud-ovest
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Acqua sui bordi nord-est e sud-ovest
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Acqua sui bordi sud-est e sud-ovest
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Terreno solo sul bordo nord-ovest
STR_CONFIG_PATCHES_WATER_BORDER_NW :Acqua solo sul bordo nord-ovest
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Acqua sui bordi nord-ovest e nord-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Acqua sui bordi nord-ovest e sud-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Terreno solo sul bordo sud-ovest
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Acqua sui bordi nord-ovest e sud-ovest
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Terreno solo sul bordo sud-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Terreno solo sul bordo nord-est
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Acqua su tutti i bordi
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Max estensione stazioni: {ORANGE}{STRING} {RED}Nota: Valori alti rallentano il gioco
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Manutieni automaticamente gli elicotteri presso gli eliporti: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Apri strumenti terreno assieme a quelli di costruzione: {ORANGE}{STRING}

20
src/lang/korean.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}맵 경
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}맵 경계에 있는 한개 이상의 타일에 무언가 있습니다
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}맵 경계에 있는 한개 이상의 타일이 물이 아닙니다
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :모든 경계선이 땅
STR_CONFIG_PATCHES_WATER_BORDER_NE :북동경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_SE :남동경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :북동와 남동경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_SW :남서경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :북동과 남서경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :남동과 남서경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :북서경계선만 땅
STR_CONFIG_PATCHES_WATER_BORDER_NW :북서경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :북서와 북동경계선에 물
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :북서와 남동경계선에 물
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :남서경계선만 땅
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :북서와 남서경계선만 물
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :남동경계선만 땅
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :북동경계선만 땅
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :모든 경계선에 물
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}역의 최대 크기: {ORANGE}{STRING} {RED}경고! 높은 값은 게임을 느리게함!
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}헬리콥터를 발착장에서 자동으로 점검 : {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}철도/도로/항만/공항 툴바에 지형 툴바 연결 : {ORANGE}{STRING}

20
src/lang/piglatin.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Enablew
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Oneway orway oremay ilestay atway ethay orthernnay edgeway areway otnay emptyway
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Oneway orway oremay ilestay atway oneway ofway ethay edgesway isway otnay aterway
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Andlay atway allway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_NE :Aterway atway orthnay-eastway orderbay onlyway
STR_CONFIG_PATCHES_WATER_BORDER_SE :Aterway atway outhsay-eastway orderbay onlyway
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Aterway atway orthnay-eastway andway outhsay-eastway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_SW :Aterway atway outhsay-estway orderbay onlyway
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Aterway atway orthnay-eastway andway outhsay-estway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Aterway atway outhsay-eastway andway outhsay-estway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Andlay onlyway atway orthnay-estway orderbay
STR_CONFIG_PATCHES_WATER_BORDER_NW :Aterway atway orthnay-estway orderbay onlyway
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Aterway atway orthnay-estway andway orthnay-eastway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Aterway atway orthnay-estway andway outhsay-eastway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Andlay onlyway atway outhsay-estway orderbay
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Aterway atway orthnay-estway andway outhsay-estway ordersbay
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Andlay onlyway atway outhsay-eastway orderbay
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Andlay onlyway atway orthnay-eastway orderbay
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Aterway atway allway ordersbay
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Axmay ationstay eadspray: {ORANGE}{STRING} {RED}Arningway: Ighhay ettingsay owsslay amegay
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Ervicesay elicoptershay atway elipadshay automaticallyway: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Inklay andscapelay oolbartay otay ailray/oadray/aterway/airportway oolbarstay: {ORANGE}{STRING}

20
src/lang/romanian.txt
View File

@ -1094,26 +1094,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Permite
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Una sau ma multe suprafeţe din marginea nordică nu sunt goale
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Una sau mai multe suprafeţe din marginea hărţii nu contin apă
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Pământ pe toate marginile
STR_CONFIG_PATCHES_WATER_BORDER_NE :Apă doar la marginea nord-estică
STR_CONFIG_PATCHES_WATER_BORDER_SE :Apă doar la marginea sud-estică
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Apă la marginile nord-estice si sud-estice
STR_CONFIG_PATCHES_WATER_BORDER_SW :Apă doar la marginea sud-vestică
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Apă la marginile nord-estice si sud-vestice
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Apă la marginile sud-estice si sud-vestice
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Pământ doar la marginea nord+vestică
STR_CONFIG_PATCHES_WATER_BORDER_NW :Apă doar la marginea nord+vestică
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Apă la marginile nord-vestice si nord-estice
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Apă la marginile nord-vestice si sud-estice
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Pământ doar la marginea sud-vestică
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Apă la marginile nord-vestice si sud-vestice
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Pământ doar la marginea sud-estică
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Pământ doar la marginea nord-estică
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Apă pe marginea hărţii
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Distanţarea maximă a staţiilor: {ORANGE}{STRING} {RED}Atenţie: Valorile mari încetinesc jocul!
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Service automat pentru elicoptere la helipaduri: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Conecteaza bara de instrumente pentru peisaj cu cea de constructii feroviare/auto/aeriane: {ORANGE}{STRING}

20
src/lang/russian.txt
View File

@ -1096,26 +1096,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Раз
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Одна или несколько клеток в северном углу не пусты
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Одна или несколько клеток берега без воды
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Земля по всем границам
STR_CONFIG_PATCHES_WATER_BORDER_NE :Вода только на СВ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_SE :Вода только на ЮВ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Вода на СВ и ЮВ краях карты
STR_CONFIG_PATCHES_WATER_BORDER_SW :Вода только на ЮЗ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Вода на СВ и ЮЗ краях карты
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Вода на ЮВ и СЗ краях карты
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Земля только на СЗ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_NW :Вода только на СЗ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Вода на СЗ и СВ краях карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Вода на СЗ и ЮВ краях карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Земля только на ЮЗ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Вода на СЗ и ЮЗ краях карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Земля только на ЮВ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Земля только на СВ краю карты
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Только водные границы
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Макс. протяженность: {ORANGE}{STRING} {RED}(большие значения замедляют игру)
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Включить обслуживание на вертолетных площадках: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Связать ландшафтную панель с транспортной: {ORANGE}{STRING}

20
src/lang/spanish.txt
View File

@ -1095,26 +1095,6 @@ STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES :{LTBLUE}Habilit
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Uno o más cuadrados del borde más al norte no están vacios
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Uno o más cuadrados en uno de los bordes no son agua
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Tierra en todos los bordes
STR_CONFIG_PATCHES_WATER_BORDER_NE :Agua solo en el borde Noreste
STR_CONFIG_PATCHES_WATER_BORDER_SE :Agua solo en el borde Sureste
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Agua en los bordes Noreste y Sureste
STR_CONFIG_PATCHES_WATER_BORDER_SW :Agua solo en el borde Suroeste
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Agua en los bordes Noreste y Suroeste
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE :Agua en los bordes Sureste y Suroeste
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Tierra solo en el borde Noroeste
STR_CONFIG_PATCHES_WATER_BORDER_NW :Agua solo en el borde Noroeste
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Agua en los bordes Noroeste y Noreste
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Agua en los bordes Noroeste y Sureste
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Tierra solo en el borde Suroeste
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Agua en los bordes Noroeste y Suroeste
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Tierra solo en el borde Sureste
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Tierra solo en el borde Noreste
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Agua en todos los bordes
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Expansión máxima de est.: {ORANGE}{STRING} {RED}Atención: Valores altos relantizan
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Mantener los helicópteros en helipuertos automáticamente: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Une la caja de paisaje a la barra de rail/carretera...: {ORANGE}{STRING}

19
src/lang/turkish.txt
View File

@ -1093,25 +1093,6 @@ STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Düzlü
STR_CONFIG_PATCHES_EDGES_NOT_EMPTY :{WHITE}Kuzey kenarda bir veya daha fazla kare boş değil
STR_CONFIG_PATCHES_EDGES_NOT_WATER :{WHITE}Kenarlardan birinde bir veya daha fazla kare su değil
# Start of map water border strings.
# DON'T ADD OR REMOVE LINES HERE
STR_CONFIG_PATCHES_WATER_BORDER_NONE :Tüm sınırlarda kara
STR_CONFIG_PATCHES_WATER_BORDER_NE :Yalnız kuzeydoğu sınırında su
STR_CONFIG_PATCHES_WATER_BORDER_SE :Yalnız güneydoğu sınırında su
STR_CONFIG_PATCHES_WATER_BORDER_SE_NE :Kuzeydoğu ve güneydoğu sınırlarında su
STR_CONFIG_PATCHES_WATER_BORDER_SW :Yalnız güneybatı sınırında su
STR_CONFIG_PATCHES_WATER_BORDER_SW_NE :Kuzeydoğu ve güneybatı sınırlarında su
STR_CONFIG_PATCHES_WATER_BORDER_SW_SE_NE :Kuzeybatı sınırında sadece kara
STR_CONFIG_PATCHES_WATER_BORDER_NW :Yalnız kuzeybatı sınırında su
STR_CONFIG_PATCHES_WATER_BORDER_NW_NE :Kuzeybatı ve kuzeydoğu sınırlarında su
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE :Kuzeybatı ve güneydoğu sınırlarında su
STR_CONFIG_PATCHES_WATER_BORDER_NW_SE_NE :Güneybatı sınırında sadece kara
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW :Kuzeybatı ve güneydoğu sınırlarında su
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_NE :Güneydoğu sınırında sadece kara
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE :Kuzeydoğu sınırında sadece kara
STR_CONFIG_PATCHES_WATER_BORDER_NW_SW_SE_NE :Tüm sınırlarda su
# End of map water border strings.
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}İstasyon genişleme sınırı: {ORANGE}{STRING} {RED}Uyarı: Yüksek değerler oyunu yavaşlatır
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Helikopterler helipadlerde otomatik servise girsin: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Arazi araç çubuğunu diğer araç çubuklarına bağla: {ORANGE}{STRING}

2
src/settings.cpp
View File

@ -1466,7 +1466,7 @@ const SettingDesc _patch_settings[] = {
SDT_VAR(GameSettings, game_creation.map_x, SLE_UINT8, S, 0, 8, 6, 11, 0, STR_CONFIG_PATCHES_MAP_X, NULL),
SDT_VAR(GameSettings, game_creation.map_y, SLE_UINT8, S, 0, 8, 6, 11, 0, STR_CONFIG_PATCHES_MAP_Y, NULL),
SDT_CONDBOOL(GameSettings, construction.freeform_edges, 111, SL_MAX_VERSION, 0, 0, false, STR_CONFIG_PATCHES_ENABLE_FREEFORM_EDGES, CheckFreeformEdges),
SDT_CONDVAR(GameSettings, game_creation.water_borders, SLE_UINT8,111, SL_MAX_VERSION, 0, 0, 15, 0, 15, 0, STR_NULL, NULL),
SDT_CONDVAR(GameSettings, game_creation.water_borders, SLE_UINT8,111, SL_MAX_VERSION, 0, 0, 15, 0, 16, 0, STR_NULL, NULL),
SDT_CONDOMANY(GameSettings, locale.currency, SLE_UINT8, 97, SL_MAX_VERSION, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL, NULL),
SDT_CONDOMANY(GameSettings, locale.units, SLE_UINT8, 97, SL_MAX_VERSION, N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL, NULL),

8
src/tgp.cpp
View File

@ -552,13 +552,6 @@ static void HeightMapAdjustWaterLevel(amplitude_t water_percent, height_t h_max_
static double perlin_coast_noise_2D(const double x, const double y, const double p, const int prime);
enum Borders {
BORDER_NE = 0,
BORDER_SE = 1,
BORDER_SW = 2,
BORDER_NW = 3,
};
/**
* This routine sculpts in from the edge a random amount, again a Perlin
* sequence, to avoid the rigid flat-edge slopes that were present before. The
@ -725,6 +718,7 @@ static void HeightMapNormalize()
HeightMapAdjustWaterLevel(water_percent, h_max_new);
byte water_borders = _settings_game.construction.freeform_edges ? _settings_game.game_creation.water_borders : 0xF;
if (water_borders == BORDERS_RANDOM) water_borders = GB(Random(), 0, 4);
HeightMapCoastLines(water_borders);
HeightMapSmoothSlopes(roughness);