diff options
author | rubidium <rubidium@openttd.org> | 2009-09-10 14:36:38 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-09-10 14:36:38 +0000 |
commit | 751ea62f442f0a8b1623e3df0c0ac5971f776d40 (patch) | |
tree | a6a4cbe98aa58a4855751d398f3bae286ba660ba | |
parent | 55ddce8da2b6993fa1228a8935526d40fc44de46 (diff) | |
download | openttd-751ea62f442f0a8b1623e3df0c0ac5971f776d40.tar.xz |
(svn r17494) -Codechange: improve algorithmic complexitiy of Depot::GetByTile from O(n) to O(1)
-rw-r--r-- | src/depot.cpp | 23 | ||||
-rw-r--r-- | src/depot_base.h | 7 |
2 files changed, 5 insertions, 25 deletions
diff --git a/src/depot.cpp b/src/depot.cpp index d315a978a..58fc86e09 100644 --- a/src/depot.cpp +++ b/src/depot.cpp @@ -24,29 +24,6 @@ DepotPool _depot_pool("Depot"); INSTANTIATE_POOL_METHODS(Depot) /** - * Gets a depot from a tile - * @param tile tile with depot - * @return Returns the depot if the tile had a depot, else it returns NULL - */ -/* static */ Depot *Depot::GetByTile(TileIndex tile) -{ - /* A ship depot is multiple tiles. The north most tile is - * always the ->xy tile, so make sure we always look for - * the nothern tile and not the southern one. */ - if (IsShipDepotTile(tile)) { - tile = min(tile, GetOtherShipDepotTile(tile)); - } - - Depot *depot; - - FOR_ALL_DEPOTS(depot) { - if (depot->xy == tile) return depot; - } - - return NULL; -} - -/** * Clean up a depot */ Depot::~Depot() diff --git a/src/depot_base.h b/src/depot_base.h index c808fb4d1..521e1e33e 100644 --- a/src/depot_base.h +++ b/src/depot_base.h @@ -13,7 +13,7 @@ #define DEPOT_BASE_H #include "tile_type.h" -#include "depot_type.h" +#include "depot_map.h" #include "core/pool_type.hpp" #include "town_type.h" @@ -27,7 +27,10 @@ struct Depot : DepotPool::PoolItem<&_depot_pool> { Depot(TileIndex xy = INVALID_TILE) : xy(xy) {} ~Depot(); - static Depot *GetByTile(TileIndex tile); + static FORCEINLINE Depot *GetByTile(TileIndex tile) + { + return Depot::Get(GetDepotIndex(tile)); + } }; #define FOR_ALL_DEPOTS_FROM(var, start) FOR_ALL_ITEMS_FROM(Depot, depot_index, var, start) |