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

@@ @@ -3,71 +3,48 @@ @@
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file depot.cpp Handling of depots. */
 #include "stdafx.h"
 #include "depot_base.h"
 #include "company_type.h"
 #include "order_func.h"
 #include "window_func.h"
 #include "core/bitmath_func.hpp"
 #include "tile_map.h"
 #include "water_map.h"
 #include "core/pool_func.hpp"
 #include "vehicle_gui.h"
 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()
+{
 	if (CleaningPool()) return;
 	/* Clear the depot from all order-lists */
 	RemoveOrderFromAllVehicles(OT_GOTO_DEPOT, this->index);
 	/* Delete the depot-window */
 	DeleteWindowById(WC_VEHICLE_DEPOT, this->xy);
 	/* Delete the depot list */
 	WindowNumber wno = (this->index << 16) | VLW_DEPOT_LIST | GetTileOwner(this->xy);
 	switch (GetTileType(this->xy)) {
 		default: break; // It can happen there is no depot here anymore (TTO/TTD savegames)
 		case MP_RAILWAY: DeleteWindowById(WC_TRAINS_LIST,  wno | (VEH_TRAIN << 11)); break;
 		case MP_ROAD:    DeleteWindowById(WC_ROADVEH_LIST, wno | (VEH_ROAD  << 11)); break;
 		case MP_WATER:   DeleteWindowById(WC_SHIPS_LIST,   wno | (VEH_SHIP  << 11)); break;
+	}
+}
 void InitializeDepots()
+{

src/depot_base.h

➞

Show inline comments

 /* $Id$ */
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file depot_base.h Base for all depots (except hangars) */
 #ifndef DEPOT_BASE_H
 #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"
 typedef Pool<Depot, DepotID, 64, 64000> DepotPool;
 extern DepotPool _depot_pool;
 struct Depot : DepotPool::PoolItem<&_depot_pool> {
 	TileIndex xy;
 	TownID town_index;
 	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)
 #define FOR_ALL_DEPOTS(var) FOR_ALL_DEPOTS_FROM(var, 0)
 #endif /* DEPOT_BASE_H */

0 comments (0 inline, 0 general)