From 150395131319afef0e6788ed27b1cf100e6ddea5 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 2 Dec 2009 10:47:18 +0000 Subject: [PATCH] (svn r18374) -Cleanup: remove some unused code --- src/pathfinder/npf/aystar.cpp | 4 ++-- src/pathfinder/yapf/yapf.h | 9 --------- src/pathfinder/yapf/yapf_ship.cpp | 18 ------------------ 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp index 8c0a657060..55a0262f19 100644 --- a/src/pathfinder/npf/aystar.cpp +++ b/src/pathfinder/npf/aystar.cpp @@ -29,8 +29,8 @@ #include "../../core/alloc_func.hpp" #include "aystar.h" -int _aystar_stats_open_size; -int _aystar_stats_closed_size; +static int _aystar_stats_open_size; +static int _aystar_stats_closed_size; /* This looks in the Hash if a node exists in ClosedList * If so, it returns the PathNode, else NULL */ diff --git a/src/pathfinder/yapf/yapf.h b/src/pathfinder/yapf/yapf.h index b020965d16..337cb02b5e 100644 --- a/src/pathfinder/yapf/yapf.h +++ b/src/pathfinder/yapf/yapf.h @@ -105,15 +105,6 @@ bool YapfTrainFindNearestSafeTile(const Train *v, TileIndex tile, Trackdir td, b /** Use this function to notify YAPF that track layout (or signal configuration) has change */ void YapfNotifyTrackLayoutChange(TileIndex tile, Track track); -/** performance measurement helpers */ -void *NpfBeginInterval(); -int NpfEndInterval(void *perf); - - -extern int _aystar_stats_open_size; -extern int _aystar_stats_closed_size; - - /** Base tile length units */ enum { YAPF_TILE_LENGTH = 100, diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp index 3647efa2d2..f300041064 100644 --- a/src/pathfinder/yapf/yapf_ship.cpp +++ b/src/pathfinder/yapf/yapf_ship.cpp @@ -185,21 +185,3 @@ Track YapfShipChooseTrack(const Ship *v, TileIndex tile, DiagDirection enterdir, Trackdir td_ret = pfnChooseShipTrack(v, tile, enterdir, tracks); return (td_ret != INVALID_TRACKDIR) ? TrackdirToTrack(td_ret) : INVALID_TRACK; } - -/** performance measurement helper */ -void *NpfBeginInterval() -{ - CPerformanceTimer& perf = *new CPerformanceTimer; - perf.Start(); - return &perf; -} - -/** performance measurement helper */ -int NpfEndInterval(void *vperf) -{ - CPerformanceTimer& perf = *(CPerformanceTimer*)vperf; - perf.Stop(); - int t = perf.Get(1000000); - delete &perf; - return t; -}