From 73ff939ddbb4772178de68f821d9c32ded846a06 Mon Sep 17 00:00:00 2001
From: maedhros <maedhros@openttd.org>
Date: Mon, 19 Mar 2007 11:27:30 +0000
Subject: (svn r9315) -Merge: The newhouses branch. With this merge comes
 almost complete support for the newhouses grf specs, so all newhouses grfs
 will be playable in the game.

Many thanks to everyone who contributed code and ideas, and all the testers
who found things we missed.
---
 projects/openttd.vcproj      | 12 ++++++++++++
 projects/openttd_vs80.vcproj | 20 ++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

(limited to 'projects')

diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
index db9fa427c..2e01dfaca 100644
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
@@ -518,6 +518,9 @@
 			<File
 				RelativePath=".\..\src\newgrf_engine.h">
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_house.h">
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_sound.h">
 			</File>
@@ -530,6 +533,9 @@
 			<File
 				RelativePath=".\..\src\newgrf_text.h">
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_town.h">
+			</File>
 			<File
 				RelativePath=".\..\src\news.h">
 			</File>
@@ -925,6 +931,9 @@
 			<File
 				RelativePath=".\..\src\newgrf_engine.cpp">
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_house.cpp">
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_sound.cpp">
 			</File>
@@ -937,6 +946,9 @@
 			<File
 				RelativePath=".\..\src\newgrf_text.cpp">
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_town.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Map Accessors"
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 86c6b1f35..668094f1a 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -448,11 +448,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\aystar.cpp"
+				RelativePath=".\..\src\autoreplace_cmd.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\autoreplace_cmd.cpp"
+				RelativePath=".\..\src\aystar.cpp"
 				>
 			</File>
 			<File
@@ -919,6 +919,10 @@
 				RelativePath=".\..\src\newgrf_engine.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_house.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_sound.h"
 				>
@@ -935,6 +939,10 @@
 				RelativePath=".\..\src\newgrf_text.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_town.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\news.h"
 				>
@@ -1455,6 +1463,10 @@
 				RelativePath=".\..\src\newgrf_engine.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_house.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_sound.cpp"
 				>
@@ -1471,6 +1483,10 @@
 				RelativePath=".\..\src\newgrf_text.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_town.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Map Accessors"
-- 
cgit v1.2.3-54-g00ecf