1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 04:29:09 +00:00

(svn r18367) -Codechange: unify the ship pathfinder 'calls'

This commit is contained in:
rubidium
2009-12-01 23:56:04 +00:00
parent 291f6490c6
commit 76fe20cdcc
13 changed files with 183 additions and 151 deletions

View File

@@ -471,10 +471,6 @@
RelativePath=".\..\src\autoreplace.cpp"
>
</File>
<File
RelativePath=".\..\src\aystar.cpp"
>
</File>
<File
RelativePath=".\..\src\bmp.cpp"
>
@@ -639,10 +635,6 @@
RelativePath=".\..\src\network\network_udp.cpp"
>
</File>
<File
RelativePath=".\..\src\npf.cpp"
>
</File>
<File
RelativePath=".\..\src\openttd.cpp"
>
@@ -651,18 +643,10 @@
RelativePath=".\..\src\os_timer.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfind.cpp"
>
</File>
<File
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\queue.cpp"
>
</File>
<File
RelativePath=".\..\src\rail.cpp"
>
@@ -807,10 +791,6 @@
RelativePath=".\..\src\autoslope.h"
>
</File>
<File
RelativePath=".\..\src\aystar.h"
>
</File>
<File
RelativePath=".\..\src\base_media_base.h"
>
@@ -1255,10 +1235,6 @@
RelativePath=".\..\src\news_type.h"
>
</File>
<File
RelativePath=".\..\src\npf.h"
>
</File>
<File
RelativePath=".\..\src\music\null_m.h"
>
@@ -1287,10 +1263,6 @@
RelativePath=".\..\src\order_type.h"
>
</File>
<File
RelativePath=".\..\src\pathfind.h"
>
</File>
<File
RelativePath=".\..\src\pbs.h"
>
@@ -1299,10 +1271,6 @@
RelativePath=".\..\src\querystring_gui.h"
>
</File>
<File
RelativePath=".\..\src\queue.h"
>
</File>
<File
RelativePath=".\..\src\rail.h"
>
@@ -3480,71 +3448,119 @@
>
</File>
</Filter>
<Filter
Name="Pathfinder"
>
<File
RelativePath=".\..\src\pathfinder\opf\opf_ship.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\opf\opf_ship.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\pathfinder_func.h"
>
</File>
</Filter>
<Filter
Name="NPF"
>
<File
RelativePath=".\..\src\pathfinder\npf\aystar.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\aystar.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\queue.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\queue.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\npf.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\npf.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\npf_func.h"
>
</File>
</Filter>
<Filter
Name="YAPF"
>
<File
RelativePath=".\..\src\yapf\follow_track.hpp"
RelativePath=".\..\src\pathfinder\yapf\follow_track.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\nodelist.hpp"
RelativePath=".\..\src\pathfinder\yapf\nodelist.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf.h"
RelativePath=".\..\src\pathfinder\yapf\yapf.h"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_base.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_common.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_costbase.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_costbase.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_costcache.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_costcache.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_costrail.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_costrail.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_destrail.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_destrail.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_node.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_node.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_node_rail.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_node_road.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_node_road.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_rail.cpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_rail.cpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_road.cpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_road.cpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_ship.cpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
>
</File>
</Filter>

View File

@@ -468,10 +468,6 @@
RelativePath=".\..\src\autoreplace.cpp"
>
</File>
<File
RelativePath=".\..\src\aystar.cpp"
>
</File>
<File
RelativePath=".\..\src\bmp.cpp"
>
@@ -636,10 +632,6 @@
RelativePath=".\..\src\network\network_udp.cpp"
>
</File>
<File
RelativePath=".\..\src\npf.cpp"
>
</File>
<File
RelativePath=".\..\src\openttd.cpp"
>
@@ -648,18 +640,10 @@
RelativePath=".\..\src\os_timer.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfind.cpp"
>
</File>
<File
RelativePath=".\..\src\pbs.cpp"
>
</File>
<File
RelativePath=".\..\src\queue.cpp"
>
</File>
<File
RelativePath=".\..\src\rail.cpp"
>
@@ -804,10 +788,6 @@
RelativePath=".\..\src\autoslope.h"
>
</File>
<File
RelativePath=".\..\src\aystar.h"
>
</File>
<File
RelativePath=".\..\src\base_media_base.h"
>
@@ -1252,10 +1232,6 @@
RelativePath=".\..\src\news_type.h"
>
</File>
<File
RelativePath=".\..\src\npf.h"
>
</File>
<File
RelativePath=".\..\src\music\null_m.h"
>
@@ -1284,10 +1260,6 @@
RelativePath=".\..\src\order_type.h"
>
</File>
<File
RelativePath=".\..\src\pathfind.h"
>
</File>
<File
RelativePath=".\..\src\pbs.h"
>
@@ -1296,10 +1268,6 @@
RelativePath=".\..\src\querystring_gui.h"
>
</File>
<File
RelativePath=".\..\src\queue.h"
>
</File>
<File
RelativePath=".\..\src\rail.h"
>
@@ -3477,71 +3445,119 @@
>
</File>
</Filter>
<Filter
Name="Pathfinder"
>
<File
RelativePath=".\..\src\pathfinder\opf\opf_ship.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\opf\opf_ship.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\pathfinder_func.h"
>
</File>
</Filter>
<Filter
Name="NPF"
>
<File
RelativePath=".\..\src\pathfinder\npf\aystar.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\aystar.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\queue.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\queue.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\npf.cpp"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\npf.h"
>
</File>
<File
RelativePath=".\..\src\pathfinder\npf\npf_func.h"
>
</File>
</Filter>
<Filter
Name="YAPF"
>
<File
RelativePath=".\..\src\yapf\follow_track.hpp"
RelativePath=".\..\src\pathfinder\yapf\follow_track.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\nodelist.hpp"
RelativePath=".\..\src\pathfinder\yapf\nodelist.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf.h"
RelativePath=".\..\src\pathfinder\yapf\yapf.h"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_base.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_common.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_costbase.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_costbase.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_costcache.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_costcache.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_costrail.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_costrail.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_destrail.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_destrail.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_node.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_node.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_node_rail.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_node_road.hpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_node_road.hpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_rail.cpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_rail.cpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_road.cpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_road.cpp"
>
</File>
<File
RelativePath=".\..\src\yapf\yapf_ship.cpp"
RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
>
</File>
</Filter>