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

Merge branch 'progsig-sx' into jgrpp

Browse Source 
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:15:18 +01:00
parent de76316634 de14c210db
commit 2bcbeea011
31 changed files with 2914 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs100.vcxproj
View File

@@ -366,6 +366,8 @@
<ClCompile Include="..\src\sdl.cpp" />
<ClCompile Include="..\src\settings.cpp" />
<ClCompile Include="..\src\signal.cpp" />
<ClCompile Include="..\src\programmable_signals.cpp" />
<ClCompile Include="..\src\programmable_signals_gui.cpp" />
<ClCompile Include="..\src\signs.cpp" />
<ClCompile Include="..\src\sound.cpp" />
<ClCompile Include="..\src\sprite.cpp" />
@@ -582,6 +584,7 @@
<ClInclude Include="..\src\ship.h" />
<ClInclude Include="..\src\signal_func.h" />
<ClInclude Include="..\src\signal_type.h" />
<ClInclude Include="..\src\programmable_signals.h" />
<ClInclude Include="..\src\signs_base.h" />
<ClInclude Include="..\src\signs_func.h" />
<ClInclude Include="..\src\signs_type.h" />
@@ -869,6 +872,7 @@
<ClCompile Include="..\src\saveload\town_sl.cpp" />
<ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
<ClCompile Include="..\src\saveload\waypoint_sl.cpp" />
<ClCompile Include="..\src\saveload\signal_sl.cpp" />
<ClInclude Include="..\src\saveload\extended_ver_sl.h" />
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp" />
<ClInclude Include="..\src\table\airport_defaults.h" />

12
projects/openttd_vs100.vcxproj.filters
View File

@@ -327,6 +327,12 @@
<ClCompile Include="..\src\signal.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\programmable_signals.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\programmable_signals_gui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\signs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -975,6 +981,9 @@
<ClInclude Include="..\src\signal_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\programmable_signals.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\signs_base.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1836,6 +1845,9 @@
<ClCompile Include="..\src\saveload\waypoint_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\signal_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\saveload\extended_ver_sl.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>

16
projects/openttd_vs80.vcproj
View File

@@ -734,6 +734,14 @@
RelativePath=".\..\src\signal.cpp"
>
</File>
<File
RelativePath=".\..\src\programmable_signals.cpp"
>
</File>
<File
RelativePath=".\..\src\programmable_signals_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\signs.cpp"
>
@@ -1602,6 +1610,10 @@
RelativePath=".\..\src\signal_type.h"
>
</File>
<File
RelativePath=".\..\src\programmable_signals.h"
>
</File>
<File
RelativePath=".\..\src\signs_base.h"
>
@@ -2770,6 +2782,10 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\signal_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.h"
>

16
projects/openttd_vs90.vcproj
View File

@@ -731,6 +731,14 @@
RelativePath=".\..\src\signal.cpp"
>
</File>
<File
RelativePath=".\..\src\programmable_signals.cpp"
>
</File>
<File
RelativePath=".\..\src\programmable_signals_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\signs.cpp"
>
@@ -1599,6 +1607,10 @@
RelativePath=".\..\src\signal_type.h"
>
</File>
<File
RelativePath=".\..\src\programmable_signals.h"
>
</File>
<File
RelativePath=".\..\src\signs_base.h"
>
@@ -2767,6 +2779,10 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\signal_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.h"
>