Merge branch 'house_placing' into jgrpp

# Conflicts: # src/settings_gui.cpp # src/settings_type.h # src/town_gui.cpp
2016-04-08 20:15:08 +01:00
parent 0d26da998b 6ebea4b49c
commit 41a06e698f
32 changed files with 1401 additions and 706 deletions
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -137,6 +137,7 @@ enum Price {
 	PR_INFRASTRUCTURE_WATER,
 	PR_INFRASTRUCTURE_STATION,
 	PR_INFRASTRUCTURE_AIRPORT,
+	PR_BUILD_HOUSE,

 	PR_END,
 	INVALID_PRICE = 0xFF