Merge branch 'house_placing' into jgrpp

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-04-08 20:15:08 +01:00
32 changed files with 1401 additions and 706 deletions

View File

@@ -102,6 +102,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
InitializeTrees();
InitializeIndustries();
InitializeObjects();
InitializeHouses();
InitializeBuildingCounts();
InitializeNPF();