dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'infrastructure_sharing-sx' into jgrpp

Browse Source 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-06 23:11:49 +01:00
parent 44ed3cb3bd b3ebb1f729
commit 4c6dc11c16
34 changed files with 808 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openttd_vs100.vcxproj
View File

@@ -331,6 +331,7 @@
<ClCompile Include="..\src\ground_vehicle.cpp" />
<ClCompile Include="..\src\heightmap.cpp" />
<ClCompile Include="..\src\highscore.cpp" />
<ClCompile Include="..\src\infrastructure.cpp" />
<ClCompile Include="..\src\hotkeys.cpp" />
<ClCompile Include="..\src\ini.cpp" />
<ClCompile Include="..\src\ini_load.cpp" />
@@ -484,6 +485,7 @@
<ClInclude Include="..\src\industry.h" />
<ClInclude Include="..\src\industry_type.h" />
<ClInclude Include="..\src\industrytype.h" />
<ClInclude Include="..\src\infrastructure_func.h" />
<ClInclude Include="..\src\ini_type.h" />
<ClInclude Include="..\src\landscape.h" />
<ClInclude Include="..\src\landscape_type.h" />

6
projects/openttd_vs100.vcxproj.filters
View File

@@ -222,6 +222,9 @@
<ClCompile Include="..\src\highscore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\infrastructure.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\hotkeys.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -681,6 +684,9 @@
<ClInclude Include="..\src\industrytype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\infrastructure_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ini_type.h">
<Filter>Header Files</Filter>
</ClInclude>

8
projects/openttd_vs80.vcproj
View File

@@ -598,6 +598,10 @@
RelativePath=".\..\src\highscore.cpp"
>
</File>
<File
RelativePath=".\..\src\infrastructure.cpp"
>
</File>
<File
RelativePath=".\..\src\hotkeys.cpp"
>
@@ -1226,6 +1230,10 @@
RelativePath=".\..\src\industrytype.h"
>
</File>
<File
RelativePath=".\..\src\infrastructure_func.h"
>
</File>
<File
RelativePath=".\..\src\ini_type.h"
>

8
projects/openttd_vs90.vcproj
View File

@@ -595,6 +595,10 @@
RelativePath=".\..\src\highscore.cpp"
>
</File>
<File
RelativePath=".\..\src\infrastructure.cpp"
>
</File>
<File
RelativePath=".\..\src\hotkeys.cpp"
>
@@ -1223,6 +1227,10 @@
RelativePath=".\..\src\industrytype.h"
>
</File>
<File
RelativePath=".\..\src\infrastructure_func.h"
>
</File>
<File
RelativePath=".\..\src\ini_type.h"
>