diff options
| author | truelight <truelight@openttd.org> | 2004-12-04 18:17:52 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2004-12-04 18:17:52 +0000 |
| commit | d15e7e307eb88ff2a5f1bb914a0373fd8a010091 (patch) | |
| tree | b51b91235f126b5bdb73d606c95d6ef6a2f8d074 /settings.c | |
| parent | 2c8f75e9284915ad2b9d94005f02505521bec4fe (diff) | |
| download | openttd-d15e7e307eb88ff2a5f1bb914a0373fd8a010091.tar.xz | |
(svn r945) -Fix: [Network] Terraform callback went wrong in merge
-Fix: Some settings went wrong in merge
Diffstat (limited to 'settings.c')
| -rw-r--r-- | settings.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/settings.c b/settings.c index f76289084..f165e70a2 100644 --- a/settings.c +++ b/settings.c @@ -783,6 +783,8 @@ static const SettingDesc patch_player_settings[] = { {"invisible_trees", SDT_BOOL, (void*)false, &_patches.invisible_trees, NULL}, {"drag_signals_density",SDT_UINT8, (void*)4, &_patches.drag_signals_density, NULL}, + {"window_snap_radius", SDT_UINT8, (void*)10, &_patches.window_snap_radius, NULL}, + {NULL, 0, NULL, NULL, NULL} }; @@ -807,7 +809,6 @@ const SettingDesc patch_settings[] = { {"new_nonstop", SDT_BOOL, (void*)false, &_patches.new_nonstop, NULL}, {"roadveh_queue", SDT_BOOL, (void*)true, &_patches.roadveh_queue, NULL}, - {"window_snap_radius", SDT_UINT8, (void*)10, &_patches.window_snap_radius, NULL}, {"snow_line_height", SDT_UINT8, (void*)7, &_patches.snow_line_height, NULL}, @@ -817,6 +818,7 @@ const SettingDesc patch_settings[] = { {"nonuniform_stations", SDT_BOOL, (void*)true, &_patches.nonuniform_stations, NULL}, {"always_small_airport",SDT_BOOL, (void*)false, &_patches.always_small_airport, NULL}, {"realistic_acceleration",SDT_BOOL, (void*)false, &_patches.realistic_acceleration, NULL}, + {"improved_load", SDT_BOOL, (void*)false, &_patches.improved_load, NULL}, {"max_trains", SDT_UINT8, (void*)80, &_patches.max_trains, NULL}, {"max_roadveh", SDT_UINT8, (void*)80, &_patches.max_roadveh, NULL}, |