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

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Browse Source 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:54:11 +01:00
parent 20e2f363f1 44d3c84a11
commit 7ed93f9211
110 changed files with 3527 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
projects/openttd_vs100.vcxproj
View File

@@ -357,6 +357,7 @@
<ClCompile Include="..\src\openttd.cpp" />
<ClCompile Include="..\src\order_backup.cpp" />
<ClCompile Include="..\src\pbs.cpp" />
<ClCompile Include="..\src\plans.cpp" />
<ClCompile Include="..\src\progress.cpp" />
<ClCompile Include="..\src\rail.cpp" />
<ClCompile Include="..\src\rev.cpp" />
@@ -559,6 +560,9 @@
<ClInclude Include="..\src\order_func.h" />
<ClInclude Include="..\src\order_type.h" />
<ClInclude Include="..\src\pbs.h" />
<ClInclude Include="..\src\plans_base.h" />
<ClInclude Include="..\src\plans_func.h" />
<ClInclude Include="..\src\plans_type.h" />
<ClInclude Include="..\src\progress.h" />
<ClInclude Include="..\src\querystring_gui.h" />
<ClInclude Include="..\src\rail.h" />
@@ -590,6 +594,7 @@
<ClInclude Include="..\src\signs_type.h" />
<ClInclude Include="..\src\slope_func.h" />
<ClInclude Include="..\src\slope_type.h" />
<ClInclude Include="..\src\smallmap_colours.h" />
<ClInclude Include="..\src\smallmap_gui.h" />
<ClInclude Include="..\src\sortlist_type.h" />
<ClInclude Include="..\src\sound_func.h" />
@@ -727,6 +732,7 @@
<ClCompile Include="..\src\object_gui.cpp" />
<ClCompile Include="..\src\order_gui.cpp" />
<ClCompile Include="..\src\osk_gui.cpp" />
<ClCompile Include="..\src\plans_gui.cpp" />
<ClCompile Include="..\src\rail_gui.cpp" />
<ClCompile Include="..\src\road_gui.cpp" />
<ClCompile Include="..\src\roadveh_gui.cpp" />
@@ -789,6 +795,7 @@
<ClInclude Include="..\src\widgets\object_widget.h" />
<ClInclude Include="..\src\widgets\order_widget.h" />
<ClInclude Include="..\src\widgets\osk_widget.h" />
<ClInclude Include="..\src\widgets\plans_widget.h" />
<ClInclude Include="..\src\widgets\rail_widget.h" />
<ClInclude Include="..\src\widgets\road_widget.h" />
<ClInclude Include="..\src\widgets\settings_widget.h" />
@@ -817,6 +824,7 @@
<ClCompile Include="..\src\misc_cmd.cpp" />
<ClCompile Include="..\src\object_cmd.cpp" />
<ClCompile Include="..\src\order_cmd.cpp" />
<ClCompile Include="..\src\plans_cmd.cpp" />
<ClCompile Include="..\src\rail_cmd.cpp" />
<ClCompile Include="..\src\road_cmd.cpp" />
<ClCompile Include="..\src\roadveh_cmd.cpp" />
@@ -862,6 +870,7 @@
<ClInclude Include="..\src\saveload\oldloader.h" />
<ClCompile Include="..\src\saveload\oldloader_sl.cpp" />
<ClCompile Include="..\src\saveload\order_sl.cpp" />
<ClCompile Include="..\src\saveload\plans_sl.cpp" />
<ClCompile Include="..\src\saveload\saveload.cpp" />
<ClInclude Include="..\src\saveload\saveload.h" />
<ClInclude Include="..\src\saveload\saveload_filter.h" />
@@ -889,6 +898,7 @@
<ClInclude Include="..\src\table\cargo_const.h" />
<ClInclude Include="..\src\table\clear_land.h" />
<ClInclude Include="..\src\table\control_codes.h" />
<ClInclude Include="..\src\table\darklight_colours.h" />
<ClInclude Include="..\src\table\elrail_data.h" />
<ClInclude Include="..\src\table\engines.h" />
<ClInclude Include="..\src\table\genland.h" />

30
projects/openttd_vs100.vcxproj.filters
View File

@@ -300,6 +300,9 @@
<ClCompile Include="..\src\pbs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\plans.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\progress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -906,6 +909,15 @@
<ClInclude Include="..\src\pbs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\plans_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\plans_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\plans_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\progress.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -999,6 +1011,9 @@
<ClInclude Include="..\src\slope_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\smallmap_colours.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\smallmap_gui.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1410,6 +1425,9 @@
<ClCompile Include="..\src\osk_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\plans_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\rail_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
@@ -1596,6 +1614,9 @@
<ClInclude Include="..\src\widgets\osk_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\plans_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\rail_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
@@ -1680,6 +1701,9 @@
<ClCompile Include="..\src\order_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\plans_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\rail_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
@@ -1815,6 +1839,9 @@
<ClCompile Include="..\src\saveload\order_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\plans_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\saveload.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
@@ -1896,6 +1923,9 @@
<ClInclude Include="..\src\table\control_codes.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\table\darklight_colours.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\table\elrail_data.h">
<Filter>Tables</Filter>
</ClInclude>

40
projects/openttd_vs80.vcproj
View File

@@ -702,6 +702,10 @@
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\plans.cpp"
>
</File>
<File
RelativePath=".\..\src\progress.cpp"
>
@@ -1526,6 +1530,18 @@
RelativePath=".\..\src\pbs.h"
>
</File>
<File
RelativePath=".\..\src\plans_base.h"
>
</File>
<File
RelativePath=".\..\src\plans_func.h"
>
</File>
<File
RelativePath=".\..\src\plans_type.h"
>
</File>
<File
RelativePath=".\..\src\progress.h"
>
@@ -1650,6 +1666,10 @@
RelativePath=".\..\src\slope_type.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_colours.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_gui.h"
>
@@ -2210,6 +2230,10 @@
RelativePath=".\..\src\osk_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_gui.cpp"
>
@@ -2462,6 +2486,10 @@
RelativePath=".\..\src\widgets\osk_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\plans_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\rail_widget.h"
>
@@ -2578,6 +2606,10 @@
RelativePath=".\..\src\order_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_cmd.cpp"
>
@@ -2762,6 +2794,10 @@
RelativePath=".\..\src\saveload\order_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\plans_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload.cpp"
>
@@ -2874,6 +2910,10 @@
RelativePath=".\..\src\table\control_codes.h"
>
</File>
<File
RelativePath=".\..\src\table\darklight_colours.h"
>
</File>
<File
RelativePath=".\..\src\table\elrail_data.h"
>

40
projects/openttd_vs90.vcproj
View File

@@ -699,6 +699,10 @@
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\plans.cpp"
>
</File>
<File
RelativePath=".\..\src\progress.cpp"
>
@@ -1523,6 +1527,18 @@
RelativePath=".\..\src\pbs.h"
>
</File>
<File
RelativePath=".\..\src\plans_base.h"
>
</File>
<File
RelativePath=".\..\src\plans_func.h"
>
</File>
<File
RelativePath=".\..\src\plans_type.h"
>
</File>
<File
RelativePath=".\..\src\progress.h"
>
@@ -1647,6 +1663,10 @@
RelativePath=".\..\src\slope_type.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_colours.h"
>
</File>
<File
RelativePath=".\..\src\smallmap_gui.h"
>
@@ -2207,6 +2227,10 @@
RelativePath=".\..\src\osk_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_gui.cpp"
>
@@ -2459,6 +2483,10 @@
RelativePath=".\..\src\widgets\osk_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\plans_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\rail_widget.h"
>
@@ -2575,6 +2603,10 @@
RelativePath=".\..\src\order_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\plans_cmd.cpp"
>
</File>
<File
RelativePath=".\..\src\rail_cmd.cpp"
>
@@ -2759,6 +2791,10 @@
RelativePath=".\..\src\saveload\order_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\plans_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload.cpp"
>
@@ -2871,6 +2907,10 @@
RelativePath=".\..\src\table\control_codes.h"
>
</File>
<File
RelativePath=".\..\src\table\darklight_colours.h"
>
</File>
<File
RelativePath=".\..\src\table\elrail_data.h"
>