Mercurial > hg > openttd
changeset 13850:da5eda07b403 draft
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 02 Dec 2009 16:48:55 +0000 |
| parents | d66e7acda8fa |
| children | 06143488a65f |
| files | projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/pathfinder/yapf/yapf.h src/pathfinder/yapf/yapf_cache.h src/pathfinder/yapf/yapf_rail.cpp src/rail_cmd.cpp src/road_cmd.cpp src/saveload/afterload.cpp src/station_cmd.cpp src/tunnelbridge_cmd.cpp src/waypoint_cmd.cpp |
| diffstat | 12 files changed, 59 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -3463,6 +3463,10 @@ RelativePath=".\..\src\pathfinder\pathfinder_func.h" > </File> + <File + RelativePath=".\..\src\pathfinder\pathfinder_type.h" + > + </File> </Filter> <Filter Name="NPF" @@ -3520,6 +3524,10 @@ > </File> <File + RelativePath=".\..\src\pathfinder\yapf\yapf_cache.h" + > + </File> + <File RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp" > </File>
--- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -3460,6 +3460,10 @@ RelativePath=".\..\src\pathfinder\pathfinder_func.h" > </File> + <File + RelativePath=".\..\src\pathfinder\pathfinder_type.h" + > + </File> </Filter> <Filter Name="NPF" @@ -3517,6 +3521,10 @@ > </File> <File + RelativePath=".\..\src\pathfinder\yapf\yapf_cache.h" + > + </File> + <File RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp" > </File>
--- a/source.list +++ b/source.list @@ -817,6 +817,7 @@ pathfinder/opf/opf_ship.cpp pathfinder/opf/opf_ship.h pathfinder/pathfinder_func.h +pathfinder/pathfinder_type.h # NPF pathfinder/npf/aystar.cpp @@ -833,6 +834,7 @@ pathfinder/yapf/yapf.h pathfinder/yapf/yapf.hpp pathfinder/yapf/yapf_base.hpp +pathfinder/yapf/yapf_cache.h pathfinder/yapf/yapf_common.hpp pathfinder/yapf/yapf_costbase.hpp pathfinder/yapf/yapf_costcache.hpp
--- a/src/pathfinder/yapf/yapf.h +++ b/src/pathfinder/yapf/yapf.h @@ -102,7 +102,4 @@ */ bool YapfTrainFindNearestSafeTile(const Train *v, TileIndex tile, Trackdir td, bool override_railtype); -/** Use this function to notify YAPF that track layout (or signal configuration) has change */ -void YapfNotifyTrackLayoutChange(TileIndex tile, Track track); - #endif /* YAPF_H */
new file mode 100644 --- /dev/null +++ b/src/pathfinder/yapf/yapf_cache.h @@ -0,0 +1,24 @@ +/* $Id$ */ + +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. + */ + +/** @file yapf_cache.h Entry point for OpenTTD to YAPF's cache. */ + +#ifndef YAPF_CACHE_H +#define YAPF_CACHE_H + +#include "../../track_type.h" + +/** + * Use this function to notify YAPF that track layout (or signal configuration) has change. + * @param tile the tile that is changed + * @param track what piece of track is changed + */ +void YapfNotifyTrackLayoutChange(TileIndex tile, Track track); + +#endif /* YAPF_CACHE_H */
--- a/src/pathfinder/yapf/yapf_rail.cpp +++ b/src/pathfinder/yapf/yapf_rail.cpp @@ -12,6 +12,7 @@ #include "../../stdafx.h" #include "yapf.hpp" +#include "yapf_cache.h" #include "yapf_node_rail.hpp" #include "yapf_costrail.hpp" #include "yapf_destrail.hpp"
--- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -17,7 +17,7 @@ #include "command_func.h" #include "engine_base.h" #include "depot_base.h" -#include "pathfinder/yapf/yapf.h" +#include "pathfinder/yapf/yapf_cache.h" #include "newgrf_engine.h" #include "landscape_type.h" #include "newgrf_commons.h"
--- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -16,7 +16,7 @@ #include "landscape.h" #include "viewport_func.h" #include "command_func.h" -#include "pathfinder/yapf/yapf.h" +#include "pathfinder/yapf/yapf_cache.h" #include "depot_base.h" #include "newgrf.h" #include "variables.h"
--- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -25,7 +25,17 @@ #include "../clear_map.h" #include "../vehicle_func.h" #include "../newgrf_station.h" -#include "../pathfinder/yapf/yapf.hpp" +#include "../openttd.h" +#include "../debug.h" +#include "../string_func.h" +#include "../date_func.h" +#include "../roadveh.h" +#include "../train.h" +#include "../station_base.h" +#include "../waypoint_base.h" +#include "../tunnelbridge_map.h" +#include "../landscape.h" +#include "../pathfinder/yapf/yapf_cache.h" #include "../elrail_func.h" #include "../signs_func.h" #include "../aircraft.h"
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -25,7 +25,7 @@ #include "newgrf_cargo.h" #include "newgrf_station.h" #include "newgrf_commons.h" -#include "pathfinder/yapf/yapf.h" +#include "pathfinder/yapf/yapf_cache.h" #include "road_internal.h" /* For drawing catenary/checking road removal */ #include "variables.h" #include "autoslope.h"