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

Port of the programmable signals patch to recent trunk

Browse Source 
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
This commit is contained in:
patch-import
2014-01-14 20:32:07 +00:00
committed by Jonathan G Rennison
parent 0b09a7ac61
commit fc0efe599e
29 changed files with 2901 additions and 111 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\table\airport_defaults.h" />
<ClInclude Include="..\src\table\airport_movement.h" />
<ClInclude Include="..\src\table\airporttile_ids.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\table\airport_defaults.h">
<Filter>Tables</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>
</Filter>
<Filter
Name="Tables"

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>
</Filter>
<Filter
Name="Tables"