From 9c219888ba02429e94cb58c915c77f2390aaa33e Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 28 Oct 2006 12:43:15 +0000 Subject: [PATCH] (svn r6992) Make a const_cast<> obsolete by properly propagating the type --- yapf/yapf_road.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yapf/yapf_road.cpp b/yapf/yapf_road.cpp index 2a4680b8cd..47dd91e54b 100644 --- a/yapf/yapf_road.cpp +++ b/yapf/yapf_road.cpp @@ -345,13 +345,13 @@ public: return true; } - static Depot* stFindNearestDepot(Vehicle* v, TileIndex tile, Trackdir td) + static Depot* stFindNearestDepot(const Vehicle* v, TileIndex tile, Trackdir td) { Tpf pf; return pf.FindNearestDepot(v, tile, td); } - FORCEINLINE Depot* FindNearestDepot(Vehicle* v, TileIndex tile, Trackdir td) + FORCEINLINE Depot* FindNearestDepot(const Vehicle* v, TileIndex tile, Trackdir td) { // set origin and destination nodes Yapf().SetOrigin(tile, TrackdirToTrackdirBits(td)); @@ -440,13 +440,13 @@ Depot* YapfFindNearestRoadDepot(const Vehicle *v) } // default is YAPF type 2 - typedef Depot* (*PfnFindNearestDepot)(Vehicle*, TileIndex, Trackdir); + typedef Depot* (*PfnFindNearestDepot)(const Vehicle*, TileIndex, Trackdir); PfnFindNearestDepot pfnFindNearestDepot = &CYapfRoadAnyDepot2::stFindNearestDepot; // check if non-default YAPF type should be used if (_patches.yapf.disable_node_optimization) pfnFindNearestDepot = &CYapfRoadAnyDepot1::stFindNearestDepot; // Trackdir, allow 90-deg - Depot* ret = pfnFindNearestDepot(const_cast(v), tile, trackdir); + Depot* ret = pfnFindNearestDepot(v, tile, trackdir); return ret; }