cpp/openttd-patchpack/source Changeset - r12990:c3b80f9ad9d5

Changeset - r12990:c3b80f9ad9d5

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-09-10 14:36:38
rubidium@openttd.org

(svn r17494) -Codechange: improve algorithmic complexitiy of Depot::GetByTile from O(n) to O(1)

2 files changed with 5 insertions and 25 deletions:

src/depot.cpp

src/depot_base.h

0 comments (0 inline, 0 general)

src/depot.cpp

➞

Show inline comments

@@ @@ -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()

src/depot_base.h

➞

Show inline comments

@@ @@ -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<&_dep @@
 	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)

0 comments (0 inline, 0 general)