Merge branch 'house_placing' into jgrpp

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
30 changed files with 718 additions and 1398 deletions

View File

@@ -1071,14 +1071,6 @@ static bool TownFoundingChanged(int32 p1)
return true;
}
static bool AllowPlacingHousesChanged(int32 p1)
{
if (_game_mode != GM_EDITOR && !_settings_game.economy.allow_placing_houses) {
DeleteWindowById(WC_BUILD_HOUSE, 0);
}
return true;
}
static bool InvalidateVehTimetableWindow(int32 p1)
{
InvalidateWindowClassesData(WC_VEHICLE_TIMETABLE, VIWD_MODIFY_ORDERS);