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
2016-05-12 22:57:42 +01:00
parent d8a083b666 95b65163e3
commit f6d374ade4
30 changed files with 718 additions and 1398 deletions
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -137,7 +137,6 @@ enum Price {
 	PR_INFRASTRUCTURE_WATER,
 	PR_INFRASTRUCTURE_STATION,
 	PR_INFRASTRUCTURE_AIRPORT,
-	PR_BUILD_HOUSE,

 	PR_END,
 	INVALID_PRICE = 0xFF