Mercurial > hg > openttd
changeset 17960:605fe213e42c draft
(svn r22769) -Fix (r22678): failed patch merging
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sat, 20 Aug 2011 14:23:14 +0000 |
parents | f3113a29d867 |
children | 24b3d023e3f5 |
files | src/genworld_gui.cpp |
diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -411,7 +411,6 @@ 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;