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

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2016-02-14 17:55:51 +00:00
parent 1f5535c0b1 99509acd1d
commit 580b2f7584
54 changed files with 4946 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projects/openttd_vs100.vcxproj
View File

@@ -291,6 +291,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\tbtr_template_gui_main.cpp" />
<ClCompile Include="..\src\tbtr_template_gui_create.cpp" />
<ClCompile Include="..\src\tbtr_template_gui_create_virtualtrain.cpp" />
<ClCompile Include="..\src\tbtr_template_vehicle.cpp" />
<ClCompile Include="..\src\tbtr_template_vehicle_func.cpp" />
<ClInclude Include="..\src\tbtr_template_gui_main.h" />
<ClInclude Include="..\src\tbtr_template_gui_create.h" />
<ClInclude Include="..\src\tbtr_template_gui_create_virtualtrain.h" />
<ClInclude Include="..\src\tbtr_template_vehicle.h" />
<ClInclude Include="..\src\tbtr_template_vehicle_func.h" />
<ClCompile Include="..\src\airport.cpp" />
<ClCompile Include="..\src\animated_tile.cpp" />
<ClCompile Include="..\src\articulated_vehicles.cpp" />
@@ -897,6 +907,8 @@
<ClCompile Include="..\src\saveload\signal_sl.cpp" />
<ClInclude Include="..\src\saveload\extended_ver_sl.h" />
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_replacement_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp" />
<ClInclude Include="..\src\table\airport_defaults.h" />
<ClInclude Include="..\src\table\airport_movement.h" />
<ClInclude Include="..\src\table\airporttile_ids.h" />

36
projects/openttd_vs100.vcxproj.filters
View File

@@ -102,6 +102,36 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\tbtr_template_gui_main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_gui_create.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_gui_create_virtualtrain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_vehicle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_vehicle_func.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="..\src\tbtr_template_gui_main.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_gui_create.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_gui_create_virtualtrain.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_vehicle.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_vehicle_func.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClCompile Include="..\src\airport.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -1920,6 +1950,12 @@
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tbtr_template_replacement_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\table\airport_defaults.h">
<Filter>Tables</Filter>
</ClInclude>

12
projects/openttd_vs140.vcxproj
View File

@@ -308,6 +308,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\tbtr_template_gui_main.cpp" />
<ClCompile Include="..\src\tbtr_template_gui_create.cpp" />
<ClCompile Include="..\src\tbtr_template_gui_create_virtualtrain.cpp" />
<ClCompile Include="..\src\tbtr_template_vehicle.cpp" />
<ClCompile Include="..\src\tbtr_template_vehicle_func.cpp" />
<ClInclude Include="..\src\tbtr_template_gui_main.h" />
<ClInclude Include="..\src\tbtr_template_gui_create.h" />
<ClInclude Include="..\src\tbtr_template_gui_create_virtualtrain.h" />
<ClInclude Include="..\src\tbtr_template_vehicle.h" />
<ClInclude Include="..\src\tbtr_template_vehicle_func.h" />
<ClCompile Include="..\src\airport.cpp" />
<ClCompile Include="..\src\animated_tile.cpp" />
<ClCompile Include="..\src\articulated_vehicles.cpp" />
@@ -914,6 +924,8 @@
<ClCompile Include="..\src\saveload\signal_sl.cpp" />
<ClInclude Include="..\src\saveload\extended_ver_sl.h" />
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_replacement_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp" />
<ClInclude Include="..\src\table\airport_defaults.h" />
<ClInclude Include="..\src\table\airport_movement.h" />
<ClInclude Include="..\src\table\airporttile_ids.h" />

36
projects/openttd_vs140.vcxproj.filters
View File

@@ -102,6 +102,36 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\tbtr_template_gui_main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_gui_create.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_gui_create_virtualtrain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_vehicle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\tbtr_template_vehicle_func.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="..\src\tbtr_template_gui_main.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_gui_create.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_gui_create_virtualtrain.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_vehicle.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tbtr_template_vehicle_func.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClCompile Include="..\src\airport.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -1920,6 +1950,12 @@
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tbtr_template_replacement_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\table\airport_defaults.h">
<Filter>Tables</Filter>
</ClInclude>

48
projects/openttd_vs80.vcproj
View File

@@ -434,6 +434,46 @@
<Filter
Name="Source Files"
>
<File
RelativePath=".\..\src\tbtr_template_gui_main.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create_virtualtrain.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle_func.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_main.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create_virtualtrain.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle_func.h"
>
</File>
<File
RelativePath=".\..\src\airport.cpp"
>
@@ -2882,6 +2922,14 @@
RelativePath=".\..\src\saveload\extended_ver_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tbtr_template_replacement_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tbtr_template_veh_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"

48
projects/openttd_vs90.vcproj
View File

@@ -431,6 +431,46 @@
<Filter
Name="Source Files"
>
<File
RelativePath=".\..\src\tbtr_template_gui_main.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create_virtualtrain.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle_func.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_main.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create_virtualtrain.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle_func.h"
>
</File>
<File
RelativePath=".\..\src\airport.cpp"
>
@@ -2879,6 +2919,14 @@
RelativePath=".\..\src\saveload\extended_ver_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tbtr_template_replacement_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tbtr_template_veh_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"