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

1
src/table/newgrf_debug_data.h
View File

@@ -159,7 +159,6 @@ static const NIFeature _nif_station = {
#define NICH(cb_id, bit) NIC(cb_id, HouseSpec, callback_mask, bit)
static const NICallback _nic_house[] = {
NICH(CBID_HOUSE_ALLOW_CONSTRUCTION, CBM_HOUSE_ALLOW_CONSTRUCTION),
NICH(CBID_HOUSE_SETUP_VARIANT, CBM_HOUSE_SETUP_VARIANT),
NICH(CBID_HOUSE_ANIMATION_NEXT_FRAME, CBM_HOUSE_ANIMATION_NEXT_FRAME),
NICH(CBID_HOUSE_ANIMATION_START_STOP, CBM_HOUSE_ANIMATION_START_STOP),
NICH(CBID_HOUSE_CONSTRUCTION_STATE_CHANGE, CBM_HOUSE_CONSTRUCTION_STATE_CHANGE),

1
src/table/pricebase.h
View File

@@ -81,6 +81,5 @@ extern const PriceBaseSpec _price_base_specs[] = {
{ 8, PCAT_RUNNING, GSF_END, PR_BUILD_CANAL }, ///< PR_INFRASTRUCTURE_WATER
{ 100, PCAT_RUNNING, GSF_END, PR_STATION_VALUE }, ///< PR_INFRASTRUCTURE_STATION
{ 5000, PCAT_RUNNING, GSF_END, PR_BUILD_STATION_AIRPORT}, ///< PR_INFRASTRUCTURE_AIRPORT
{1000000, PCAT_CONSTRUCTION, GSF_END, PR_BUILD_INDUSTRY }, ///< PR_BUILD_HOUSE
};
assert_compile(lengthof(_price_base_specs) == PR_END);

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]

4
src/table/town_land.h
View File

@@ -1812,8 +1812,8 @@ assert_compile(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4);
* @see HouseSpec
*/
#define MS(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \
{mnd, mxd, p, rc, DefaultHouseCostBaseMultiplier(0, p, mg, ca1, ca2, ca3, cg1, cg2, cg3), bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \
GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 0, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
{mnd, mxd, p, rc, bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \
GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
/** House specifications from original data */
static const HouseSpec _original_house_specs[] = {
/**