--- a/main_gui.c Sat Dec 04 18:16:20 2004 +0000
+++ b/main_gui.c Sat Dec 04 18:17:52 2004 +0000
@@ -44,6 +44,8 @@
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 @@
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;
--- a/settings.c Sat Dec 04 18:16:20 2004 +0000
+++ b/settings.c Sat Dec 04 18:17:52 2004 +0000
@@ -783,6 +783,8 @@
{"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 @@
{"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 @@
{"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},
--- a/settings_gui.c Sat Dec 04 18:16:20 2004 +0000
+++ b/settings_gui.c Sat Dec 04 18:17:52 2004 +0000
@@ -588,7 +588,7 @@
{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},
};
--- a/terraform_gui.c Sat Dec 04 18:16:20 2004 +0000
+++ b/terraform_gui.c Sat Dec 04 18:17:52 2004 +0000
@@ -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);