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

Allow building multiple docks per station.

Browse Source 
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
This commit is contained in:
keldorkatarn
2017-09-11 22:48:19 +02:00
committed by Jonathan G Rennison
parent d486d58d86
commit 1d3cf59d8a
26 changed files with 412 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/openttd_vs100.vcxproj
View File

@@ -333,6 +333,7 @@
<ClCompile Include="..\src\departures.cpp" />
<ClCompile Include="..\src\depot.cpp" />
<ClCompile Include="..\src\disaster_vehicle.cpp" />
<ClCompile Include="..\src\dock.cpp" />
<ClCompile Include="..\src\driver.cpp" />
<ClCompile Include="..\src\economy.cpp" />
<ClCompile Include="..\src\effectvehicle.cpp" />
@@ -469,6 +470,7 @@
<ClInclude Include="..\src\direction_type.h" />
<ClInclude Include="..\src\disaster_vehicle.h" />
<ClInclude Include="..\src\music\dmusic.h" />
<ClInclude Include="..\src\dock_base.h" />
<ClInclude Include="..\src\driver.h" />
<ClInclude Include="..\src\economy_base.h" />
<ClInclude Include="..\src\economy_func.h" />
@@ -610,6 +612,7 @@
<ClInclude Include="..\src\sdl.h" />
<ClInclude Include="..\src\sound\sdl_s.h" />
<ClInclude Include="..\src\video\sdl_v.h" />
<ClInclude Include="..\src\schdispatch.h" />
<ClInclude Include="..\src\settings_func.h" />
<ClInclude Include="..\src\settings_gui.h" />
<ClInclude Include="..\src\settings_internal.h" />
@@ -641,6 +644,7 @@
<ClInclude Include="..\src\strgen\strgen.h" />
<ClInclude Include="..\src\string_base.h" />
<ClInclude Include="..\src\string_func.h" />
<ClInclude Include="..\src\string_func_extra.h" />
<ClInclude Include="..\src\string_type.h" />
<ClInclude Include="..\src\stringfilter_type.h" />
<ClInclude Include="..\src\strings_func.h" />
@@ -771,6 +775,7 @@
<ClCompile Include="..\src\rail_gui.cpp" />
<ClCompile Include="..\src\road_gui.cpp" />
<ClCompile Include="..\src\roadveh_gui.cpp" />
<ClCompile Include="..\src\schdispatch_gui.cpp" />
<ClCompile Include="..\src\settings_gui.cpp" />
<ClCompile Include="..\src\ship_gui.cpp" />
<ClCompile Include="..\src\signs_gui.cpp" />
@@ -864,6 +869,7 @@
<ClCompile Include="..\src\rail_cmd.cpp" />
<ClCompile Include="..\src\road_cmd.cpp" />
<ClCompile Include="..\src\roadveh_cmd.cpp" />
<ClCompile Include="..\src\schdispatch_cmd.cpp" />
<ClCompile Include="..\src\ship_cmd.cpp" />
<ClCompile Include="..\src\signs_cmd.cpp" />
<ClCompile Include="..\src\station_cmd.cpp" />

18
projects/openttd_vs100.vcxproj.filters
View File

@@ -195,6 +195,9 @@
<ClCompile Include="..\src\disaster_vehicle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\dock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\driver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -603,6 +606,9 @@
<ClInclude Include="..\src\music\dmusic.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\dock_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\driver.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1026,6 +1032,9 @@
<ClInclude Include="..\src\video\sdl_v.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\schdispatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\settings_func.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1119,6 +1128,9 @@
<ClInclude Include="..\src\string_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\string_func_extra.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\string_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1509,6 +1521,9 @@
<ClCompile Include="..\src\roadveh_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\schdispatch_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\settings_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
@@ -1788,6 +1803,9 @@
<ClCompile Include="..\src\roadveh_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\schdispatch_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\ship_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>

6
projects/openttd_vs140.vcxproj
View File

@@ -350,6 +350,7 @@
<ClCompile Include="..\src\departures.cpp" />
<ClCompile Include="..\src\depot.cpp" />
<ClCompile Include="..\src\disaster_vehicle.cpp" />
<ClCompile Include="..\src\dock.cpp" />
<ClCompile Include="..\src\driver.cpp" />
<ClCompile Include="..\src\economy.cpp" />
<ClCompile Include="..\src\effectvehicle.cpp" />
@@ -486,6 +487,7 @@
<ClInclude Include="..\src\direction_type.h" />
<ClInclude Include="..\src\disaster_vehicle.h" />
<ClInclude Include="..\src\music\dmusic.h" />
<ClInclude Include="..\src\dock_base.h" />
<ClInclude Include="..\src\driver.h" />
<ClInclude Include="..\src\economy_base.h" />
<ClInclude Include="..\src\economy_func.h" />
@@ -627,6 +629,7 @@
<ClInclude Include="..\src\sdl.h" />
<ClInclude Include="..\src\sound\sdl_s.h" />
<ClInclude Include="..\src\video\sdl_v.h" />
<ClInclude Include="..\src\schdispatch.h" />
<ClInclude Include="..\src\settings_func.h" />
<ClInclude Include="..\src\settings_gui.h" />
<ClInclude Include="..\src\settings_internal.h" />
@@ -658,6 +661,7 @@
<ClInclude Include="..\src\strgen\strgen.h" />
<ClInclude Include="..\src\string_base.h" />
<ClInclude Include="..\src\string_func.h" />
<ClInclude Include="..\src\string_func_extra.h" />
<ClInclude Include="..\src\string_type.h" />
<ClInclude Include="..\src\stringfilter_type.h" />
<ClInclude Include="..\src\strings_func.h" />
@@ -788,6 +792,7 @@
<ClCompile Include="..\src\rail_gui.cpp" />
<ClCompile Include="..\src\road_gui.cpp" />
<ClCompile Include="..\src\roadveh_gui.cpp" />
<ClCompile Include="..\src\schdispatch_gui.cpp" />
<ClCompile Include="..\src\settings_gui.cpp" />
<ClCompile Include="..\src\ship_gui.cpp" />
<ClCompile Include="..\src\signs_gui.cpp" />
@@ -881,6 +886,7 @@
<ClCompile Include="..\src\rail_cmd.cpp" />
<ClCompile Include="..\src\road_cmd.cpp" />
<ClCompile Include="..\src\roadveh_cmd.cpp" />
<ClCompile Include="..\src\schdispatch_cmd.cpp" />
<ClCompile Include="..\src\ship_cmd.cpp" />
<ClCompile Include="..\src\signs_cmd.cpp" />
<ClCompile Include="..\src\station_cmd.cpp" />

18
projects/openttd_vs140.vcxproj.filters
View File

@@ -195,6 +195,9 @@
<ClCompile Include="..\src\disaster_vehicle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\dock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\driver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -603,6 +606,9 @@
<ClInclude Include="..\src\music\dmusic.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\dock_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\driver.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1026,6 +1032,9 @@
<ClInclude Include="..\src\video\sdl_v.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\schdispatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\settings_func.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1119,6 +1128,9 @@
<ClInclude Include="..\src\string_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\string_func_extra.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\string_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1509,6 +1521,9 @@
<ClCompile Include="..\src\roadveh_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\schdispatch_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\settings_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
@@ -1788,6 +1803,9 @@
<ClCompile Include="..\src\roadveh_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\schdispatch_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\ship_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>

24
projects/openttd_vs80.vcproj
View File

@@ -554,6 +554,10 @@
RelativePath=".\..\src\disaster_vehicle.cpp"
>
</File>
<File
RelativePath=".\..\src\dock.cpp"
>
</File>
<File
RelativePath=".\..\src\driver.cpp"
>
@@ -1102,6 +1106,10 @@
RelativePath=".\..\src\music\dmusic.h"
>
</File>
<File
RelativePath=".\..\src\dock_base.h"
>
</File>
<File
RelativePath=".\..\src\driver.h"
>
@@ -1666,6 +1674,10 @@
RelativePath=".\..\src\video\sdl_v.h"
>
</File>
<File
RelativePath=".\..\src\schdispatch.h"
>
</File>
<File
RelativePath=".\..\src\settings_func.h"
>
@@ -1790,6 +1802,10 @@
RelativePath=".\..\src\string_func.h"
>
</File>
<File
RelativePath=".\..\src\string_func_extra.h"
>
</File>
<File
RelativePath=".\..\src\string_type.h"
>
@@ -2318,6 +2334,10 @@
RelativePath=".\..\src\roadveh_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\schdispatch_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\settings_gui.cpp"
>
@@ -2698,6 +2718,10 @@
RelativePath=".\..\src\roadveh_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\schdispatch_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\ship_cmd.cpp"
>

24
projects/openttd_vs90.vcproj
View File

@@ -551,6 +551,10 @@
RelativePath=".\..\src\disaster_vehicle.cpp"
>
</File>
<File
RelativePath=".\..\src\dock.cpp"
>
</File>
<File
RelativePath=".\..\src\driver.cpp"
>
@@ -1099,6 +1103,10 @@
RelativePath=".\..\src\music\dmusic.h"
>
</File>
<File
RelativePath=".\..\src\dock_base.h"
>
</File>
<File
RelativePath=".\..\src\driver.h"
>
@@ -1663,6 +1671,10 @@
RelativePath=".\..\src\video\sdl_v.h"
>
</File>
<File
RelativePath=".\..\src\schdispatch.h"
>
</File>
<File
RelativePath=".\..\src\settings_func.h"
>
@@ -1787,6 +1799,10 @@
RelativePath=".\..\src\string_func.h"
>
</File>
<File
RelativePath=".\..\src\string_func_extra.h"
>
</File>
<File
RelativePath=".\..\src\string_type.h"
>
@@ -2315,6 +2331,10 @@
RelativePath=".\..\src\roadveh_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\schdispatch_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\settings_gui.cpp"
>
@@ -2695,6 +2715,10 @@
RelativePath=".\..\src\roadveh_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\schdispatch_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\ship_cmd.cpp"
>