(svn r945) -Fix: [Network] Terraform callback went wrong in merge

-Fix: Some settings went wrong in merge

4 files changed, 7 insertions, 12 deletions

diff --git a/main_gui.c b/main_gui.c
index 8740e28ac..42125d347 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -44,6 +44,8 @@ extern void GenerateTowns();
 
 extern uint GetCurrentCurrencyRate();
 
+extern void CcTerraform(bool success, uint tile, uint32 p1, uint32 p2);
+
 void HandleOnEditTextCancel() {
 	switch(_rename_what) {
 #ifdef ENABLE_NETWORK
@@ -1116,15 +1118,6 @@ static void AskResetLandscape(uint mode)
 	AllocateWindowDescFront(&_ask_reset_landscape_desc, mode);
 }
 
-void CcTerraform(bool success, uint tile, uint32 p1, uint32 p2)
-{
-	if (success) {
-		SndPlayTileFx(SND_1F_SPLAT, tile);
-	} else {
-		SetRedErrorSquare(_terraform_err_tile);
-	}
-}
-
 static void CommonRaiseLowerBigLand(uint tile, int mode)
 {
 	int size;
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},
diff --git a/settings_gui.c b/settings_gui.c
index ab37ad18f..1083f8d77 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -588,7 +588,7 @@ static const PatchEntry _patches_ui[] = {
 
 	{PE_UINT8,	PF_MULTISTRING, STR_CONFIG_PATCHES_TOOLBAR_POS, &_patches.toolbar_pos,			0,  2,  1, &v_PositionMainToolbar},
 	{PE_UINT8,	PF_MULTISTRING | PF_PLAYERBASED, STR_CONFIG_PATCHES_TOOLBAR_POS, &_patches.toolbar_pos,			0,  2,  1, &v_PositionMainToolbar},
-	{PE_UINT8,	PF_0ISDIS, STR_CONFIG_PATCHES_SNAP_RADIUS, &_patches.window_snap_radius,     1, 32,  1, NULL},
+	{PE_UINT8,	PF_0ISDIS | PF_PLAYERBASED, STR_CONFIG_PATCHES_SNAP_RADIUS, &_patches.window_snap_radius,     1, 32,  1, NULL},
 	{PE_BOOL,		PF_PLAYERBASED, STR_CONFIG_PATCHES_INVISIBLE_TREES,	&_patches.invisible_trees,					0,  1,  1, &InvisibleTreesActive},
 };
 
diff --git a/terraform_gui.c b/terraform_gui.c
index f94ebf92b..1076c3c82 100644
--- a/terraform_gui.c
+++ b/terraform_gui.c
@@ -10,7 +10,7 @@
 #include "vehicle.h"
 
 
-static void CcTerraform(bool success, uint tile, uint32 p1, uint32 p2)
+void CcTerraform(bool success, uint tile, uint32 p1, uint32 p2)
 {
 	if (success) {
 		SndPlayTileFx(SND_1F_SPLAT, tile);