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

(svn r1441) Fixed a couple of warnings, and removed a pointless assert

This commit is contained in:
celestar 2005-01-09 10:04:30 +00:00
parent e17a8989cf
commit 86c3bfd66d
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings.c
View File

@ -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},

2
settings_gui.c
View File

@ -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},
};

2
station_cmd.c
View File

@ -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);