diff options
author | tron <tron@openttd.org> | 2006-10-28 12:43:15 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2006-10-28 12:43:15 +0000 |
commit | 30ceecc1af8b4f03ac6da7170935a8f185adce27 (patch) | |
tree | 194c249d0f6085307f6dcf9c1f801502d84553fb /yapf | |
parent | 93f1f8ee532109faf767fc118531f8caf094fcaa (diff) | |
download | openttd-30ceecc1af8b4f03ac6da7170935a8f185adce27.tar.xz |
(svn r6992) Make a const_cast<> obsolete by properly propagating the type
Diffstat (limited to 'yapf')
-rw-r--r-- | yapf/yapf_road.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yapf/yapf_road.cpp b/yapf/yapf_road.cpp index 2a4680b8c..47dd91e54 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<Vehicle*>(v), tile, trackdir); + Depot* ret = pfnFindNearestDepot(v, tile, trackdir); return ret; } |