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

Fix order removal due to shared-infra company deletion.

Browse Source 
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
This commit is contained in:
Jonathan G Rennison
2017-02-22 20:51:45 +00:00
parent 11e4bcee40
commit f3b1059930
10 changed files with 106 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openttd_vs100.vcxproj
View File

@@ -556,6 +556,7 @@
<ClInclude Include="..\src\openttd.h" />
<ClInclude Include="..\src\order_backup.h" />
<ClInclude Include="..\src\order_base.h" />
<ClInclude Include="..\src\order_cmd.h" />
<ClInclude Include="..\src\order_func.h" />
<ClInclude Include="..\src\order_type.h" />
<ClInclude Include="..\src\pbs.h" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -897,6 +897,9 @@
<ClInclude Include="..\src\order_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_cmd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_func.h">
<Filter>Header Files</Filter>
</ClInclude>

3
projects/openttd_vs140.vcxproj
View File

@@ -348,6 +348,7 @@
<ClCompile Include="..\src\ground_vehicle.cpp" />
<ClCompile Include="..\src\heightmap.cpp" />
<ClCompile Include="..\src\highscore.cpp" />
<ClCompile Include="..\src\infrastructure.cpp" />
<ClCompile Include="..\src\hotkeys.cpp" />
<ClCompile Include="..\src\ini.cpp" />
<ClCompile Include="..\src\ini_load.cpp" />
@@ -498,6 +499,7 @@
<ClInclude Include="..\src\industry.h" />
<ClInclude Include="..\src\industry_type.h" />
<ClInclude Include="..\src\industrytype.h" />
<ClInclude Include="..\src\infrastructure_func.h" />
<ClInclude Include="..\src\ini_type.h" />
<ClInclude Include="..\src\landscape.h" />
<ClInclude Include="..\src\landscape_type.h" />
@@ -571,6 +573,7 @@
<ClInclude Include="..\src\openttd.h" />
<ClInclude Include="..\src\order_backup.h" />
<ClInclude Include="..\src\order_base.h" />
<ClInclude Include="..\src\order_cmd.h" />
<ClInclude Include="..\src\order_func.h" />
<ClInclude Include="..\src\order_type.h" />
<ClInclude Include="..\src\pbs.h" />

9
projects/openttd_vs140.vcxproj.filters
View File

@@ -222,6 +222,9 @@
<ClCompile Include="..\src\highscore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\infrastructure.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\hotkeys.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -672,6 +675,9 @@
<ClInclude Include="..\src\industrytype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\infrastructure_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ini_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -891,6 +897,9 @@
<ClInclude Include="..\src\order_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_cmd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_func.h">
<Filter>Header Files</Filter>
</ClInclude>

4
projects/openttd_vs80.vcproj
View File

@@ -1498,6 +1498,10 @@
RelativePath=".\..\src\order_base.h"
>
</File>
<File
RelativePath=".\..\src\order_cmd.h"
>
</File>
<File
RelativePath=".\..\src\order_func.h"
>

4
projects/openttd_vs90.vcproj
View File

@@ -1495,6 +1495,10 @@
RelativePath=".\..\src\order_base.h"
>
</File>
<File
RelativePath=".\..\src\order_cmd.h"
>
</File>
<File
RelativePath=".\..\src\order_func.h"
>