summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-08-20 14:23:14 +0000
committerrubidium <rubidium@openttd.org>2011-08-20 14:23:14 +0000
commite17d799cb3a741e5d927a2a85eb17302058295c4 (patch)
tree4672b5a7f8c3803bceb17f8ead642b46b78c1c0b /src
parent11a4e402c60c07b734e74db8e4bf7b18c7267d7a (diff)
downloadopenttd-e17d799cb3a741e5d927a2a85eb17302058295c4.tar.xz
(svn r22769) -Fix (r22678): failed patch merging
Diffstat (limited to 'src')
-rw-r--r--src/genworld_gui.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 0987a2157..8101a9c7b 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -411,7 +411,6 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
break;
case GLAND_RIVER_PULLDOWN: SetDParam(0, _rivers[_settings_newgame.game_creation.amount_of_rivers]); break;
- case GLAND_RIVER_PULLDOWN: SetDParam(0, _rivers[_settings_newgame.game_creation.amount_of_rivers]); break;
case GLAND_SMOOTHNESS_PULLDOWN: SetDParam(0, _smoothness[_settings_newgame.game_creation.tgen_smoothness]); break;
case GLAND_VARIETY_PULLDOWN: SetDParam(0, _variety[_settings_newgame.game_creation.variety]); break;
case GLAND_BORDERS_RANDOM: SetDParam(0, (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? STR_MAPGEN_BORDER_RANDOMIZE : STR_MAPGEN_BORDER_MANUAL); break;