diff options
| author | celestar <celestar@openttd.org> | 2005-01-09 10:04:30 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2005-01-09 10:04:30 +0000 |
| commit | 86c3bfd66da0dff9bfae871ee8bb457800659eeb (patch) | |
| tree | 6bc51ff3cc00d07dfbf0b802b04b92b9f6ae0c9d | |
| parent | e17a8989cf87ee7b94199873429b238e9c0c8d62 (diff) | |
| download | openttd-86c3bfd66da0dff9bfae871ee8bb457800659eeb.tar.xz | |
(svn r1441) Fixed a couple of warnings, and removed a pointless assert
| -rw-r--r-- | settings.c | 2 | ||||
| -rw-r--r-- | settings_gui.c | 2 | ||||
| -rw-r--r-- | station_cmd.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/settings.c b/settings.c index 552fc4ea5..3fab00e3a 100644 --- a/settings.c +++ b/settings.c @@ -838,7 +838,7 @@ const SettingDesc patch_settings[] = { {"join_stations", SDT_BOOL, (void*)true, &_patches.join_stations, NULL}, {"station_spread", SDT_UINT8, (void*)12, &_patches.station_spread, NULL}, {"full_load_any", SDT_BOOL, (void*)true, &_patches.full_load_any, NULL}, - {"modified_catchment", SDT_BOOL, (void*)true, &_patches.modified_catchment}, + {"modified_catchment", SDT_BOOL, (void*)true, &_patches.modified_catchment, NULL}, {"inflation", SDT_BOOL, (void*)true, &_patches.inflation, NULL}, diff --git a/settings_gui.c b/settings_gui.c index 4d862f425..b607d2960 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -669,7 +669,7 @@ static const PatchEntry _patches_stations[] = { {PE_BOOL, 0, STR_CONFIG_PATCHES_NONUNIFORM_STATIONS, "nonuniform_stations", &_patches.nonuniform_stations, 0, 0, 0, NULL}, {PE_UINT8, 0, STR_CONFIG_PATCHES_STATION_SPREAD, "station_spread", &_patches.station_spread, 4, 64, 1, NULL}, {PE_BOOL, 0, STR_CONFIG_PATCHES_SERVICEATHELIPAD, "service_at_helipad", &_patches.serviceathelipad, 0, 0, 0, NULL}, - {PE_BOOL, 0, STR_CONFIG_PATCHES_CATCHMENT, "modified_catchment", &_patches.modified_catchment}, + {PE_BOOL, 0, STR_CONFIG_PATCHES_CATCHMENT, "modified_catchment", &_patches.modified_catchment, 0, 0, 0, NULL}, }; diff --git a/station_cmd.c b/station_cmd.c index f6bac7bfa..c22b59f0c 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -2612,8 +2612,6 @@ uint MoveGoodsToStation(uint tile, int w, int h, int type, uint amount) UpdateStationWaiting(st1, type, moved); } - assert(amount >= 0); - if (amount != 0) { moved += (amount = (amount * best_rating2 >> 8) + 1); UpdateStationWaiting(st2, type, amount); |