dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'house_placing' into jgrpp

Browse Source 
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-05-12 22:57:42 +01:00
parent d8a083b666 95b65163e3
commit f6d374ade4
30 changed files with 718 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/table/settings.ini
View File

@@ -25,7 +25,6 @@ static bool TrainSlopeSteepnessChanged(int32 p1);
static bool RoadVehSlopeSteepnessChanged(int32 p1);
static bool DragSignalsDensityChanged(int32);
static bool TownFoundingChanged(int32 p1);
static bool AllowPlacingHousesChanged(int32 p1);
static bool DifficultyNoiseChange(int32 i);
static bool MaxNoAIsChange(int32 i);
static bool CheckRoadSide(int p1);
@@ -705,17 +704,6 @@ def = true
str = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
; TODO: add this setting to savegames
[SDT_BOOL]
base = GameSettings
var = economy.allow_placing_houses
flags = SLF_NOT_IN_SAVE
def = false
str = STR_CONFIG_SETTING_ALLOW_PLACING_HOUSES
strhelp = STR_CONFIG_SETTING_ALLOW_PLACING_HOUSES_HELPTEXT
proc = AllowPlacingHousesChanged
cat = SC_BASIC
; link graph
[SDT_VAR]