# HG changeset patch
# User celestar
# Date 1105265070 0
# Node ID 9c58dedb8e5f7f5806adb42158d8ea25bdb43c5b
# Parent  1f6546ea35a364d269e53562f8f48778a6c488fc
(svn r1441) Fixed a couple of warnings, and removed a pointless assert

diff -r 1f6546ea35a3 -r 9c58dedb8e5f settings.c
--- a/settings.c	Sun Jan 09 08:49:40 2005 +0000
+++ b/settings.c	Sun Jan 09 10:04:30 2005 +0000
@@ -838,7 +838,7 @@
 	{"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 -r 1f6546ea35a3 -r 9c58dedb8e5f settings_gui.c
--- a/settings_gui.c	Sun Jan 09 08:49:40 2005 +0000
+++ b/settings_gui.c	Sun Jan 09 10:04:30 2005 +0000
@@ -669,7 +669,7 @@
 	{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 -r 1f6546ea35a3 -r 9c58dedb8e5f station_cmd.c
--- a/station_cmd.c	Sun Jan 09 08:49:40 2005 +0000
+++ b/station_cmd.c	Sun Jan 09 10:04:30 2005 +0000
@@ -2612,8 +2612,6 @@
 		UpdateStationWaiting(st1, type, moved);
 	}
 
-	assert(amount >= 0);
-
 	if (amount != 0) {
 		moved += (amount = (amount * best_rating2 >> 8) + 1);
 		UpdateStationWaiting(st2, type, amount);