cpp/openttd-patchpack/source Changeset - r9036:e33a0264e0c3

Changeset - r9036:e33a0264e0c3

Parent rev.

Child rev.

[Not reviewed]

master

0 11 0

rubidium - 16 years ago 2008-04-23 20:56:08
rubidium@openttd.org

(svn r12855) -Codechange: do not use autoptr's for testing whether certain objects can be build, but check it directly in the pool so we do not have to call destructors in the testing phase. Stations still use the autoptr though.

11 files changed with 57 insertions and 76 deletions:

src/engine.cpp

src/group_cmd.cpp

src/industry_cmd.cpp

src/oldpool.h

src/rail_cmd.cpp

src/road_cmd.cpp

src/ship_cmd.cpp

src/signs.cpp

src/town_cmd.cpp

src/water_cmd.cpp

src/waypoint.cpp

0 comments (0 inline, 0 general)

src/engine.cpp

➞

Show inline comments

@@ @@ -12,13 +12,12 @@ @@
 #include "saveload.h"
 #include "variables.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_cargo.h"
 #include "group.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "autoreplace_base.h"
@@ @@ -513,25 +512,21 @@ CommandCost AddEngineReplacement(EngineR @@
 	er = GetEngineReplacement(*erl, old_engine, group);
 	if (er != NULL) {
 		if (flags & DC_EXEC) er->to = new_engine;
 		return CommandCost();
+	}
 	er = new EngineRenew(old_engine, new_engine);
 	if (er == NULL) return CMD_ERROR;
 	AutoPtrT<EngineRenew> er_auto_delete = er;
 	if (!EngineRenew::CanAllocateItem()) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		er = new EngineRenew(old_engine, new_engine);
 		er->group_id = group;
 		/* Insert before the first element */
 		er->next = (EngineRenew *)(*erl);
 		*erl = (EngineRenewList)er;
 		er_auto_delete.Detach();
+	}
 	return CommandCost();
+}
 CommandCost RemoveEngineReplacement(EngineRenewList *erl, EngineID engine, GroupID group, uint32 flags)

src/group_cmd.cpp

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 #include "saveload.h"
 #include "debug.h"
 #include "group.h"
 #include "train.h"
 #include "aircraft.h"
 #include "vehicle_gui.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_base.h"
 #include "autoreplace_func.h"
@@ @@ -91,26 +90,20 @@ static WindowClass GetWCForVT(VehicleTyp @@
  */
 CommandCost CmdCreateGroup(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	VehicleType vt = (VehicleType)p1;
 	if (!IsPlayerBuildableVehicleType(vt)) return CMD_ERROR;
 	AutoPtrT<Group> g_auto_delete;
 	Group *g = new Group(_current_player);
 	if (g == NULL) return CMD_ERROR;
 	g_auto_delete = g;
 	if (!Group::CanAllocateItem()) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		Group *g = new Group(_current_player);
 		g->replace_protection = false;
 		g->vehicle_type = vt;
 		InvalidateWindowData(GetWCForVT(vt), (vt << 11) | VLW_GROUP_LIST | _current_player);
 		g_auto_delete.Detach();
+	}
 	return CommandCost();
+}

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -23,13 +23,12 @@ @@
 #include "cargotype.h"
 #include "newgrf.h"
 #include "newgrf_commons.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_callbacks.h"
 #include "misc/autoptr.hpp"
 #include "autoslope.h"
 #include "transparency.h"
 #include "water.h"
 #include "strings_func.h"
 #include "tile_cmd.h"
 #include "functions.h"
@@ @@ -1589,23 +1588,25 @@ static Industry *CreateNewIndustryHelper @@
 	const Town *t = CheckMultipleIndustryInTown(tile, type);
 	if (t == NULL) return NULL;
 	if (!CheckIfIndustryIsAllowed(tile, type, t)) return NULL;
 	if (!CheckSuitableIndustryPos(tile)) return NULL;
 	Industry *i = new Industry(tile);
 	if (i == NULL) return NULL;
 	AutoPtrT<Industry> i_auto_delete = i;
 	if (!Industry::CanAllocateItem()) return NULL;
 	if (flags & DC_EXEC) {
 		Industry *i = new Industry(tile);
 		if (!custom_shape_check) CheckIfCanLevelIndustryPlatform(tile, DC_EXEC, it, type);
 		DoCreateNewIndustry(i, tile, type, it, itspec_index, t, OWNER_NONE);
 		i_auto_delete.Detach();
 		return i;
+	}
 	return i;
 	/* We need to return a non-NULL pointer to tell we have created an industry.
 	 * However, we haven't created a real one (no DC_EXEC), so return a fake one. */
 	return GetIndustry(0);
+}
 /** Build/Fund an industry
  * @param tile tile where industry is built
  * @param flags of operations to conduct
  * @param p1 various bitstuffed elements

src/oldpool.h

➞

Show inline comments

@@ @@ -289,12 +289,24 @@ protected: @@
 	 * @return true if we are
 	 */
 	static inline bool CleaningPool()
+	{
 		return Tpool->CleaningPool();
+	}
 public:
 	/**
 	 * Check whether we can allocate an item in this pool. This to prevent the
 	 * need to actually construct the object and then destructing it again,
 	 * which could be *very* costly.
 	 * @return true if and only if at least ONE item can be allocated.
 	 */
 	static inline bool CanAllocateItem()
+	{
 		return AllocateRaw() != NULL;
+	}
 };
 #define OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \
 	enum { \
 		name##_POOL_BLOCK_SIZE_BITS = block_size_bits, \

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -27,13 +27,12 @@ @@
 #include "newgrf.h"
 #include "yapf/yapf.h"
 #include "newgrf_engine.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_station.h"
 #include "train.h"
 #include "misc/autoptr.hpp"
 #include "variables.h"
 #include "autoslope.h"
 #include "transparency.h"
 #include "water.h"
 #include "tunnelbridge_map.h"
 #include "window_func.h"
@@ @@ -763,26 +762,23 @@ CommandCost CmdBuildTrainDepot(TileIndex @@
 	CommandCost cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(cost)) return CMD_ERROR;
 	if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
 	Depot *d = new Depot(tile);
 	if (d == NULL) return CMD_ERROR;
 	AutoPtrT<Depot> d_auto_delete = d;
 	if (!Depot::CanAllocateItem()) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		Depot *d = new Depot(tile);
 		MakeRailDepot(tile, _current_player, dir, (RailType)p1);
 		MarkTileDirtyByTile(tile);
 		d->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 		AddSideToSignalBuffer(tile, INVALID_DIAGDIR, _current_player);
 		YapfNotifyTrackLayoutChange(tile, TrackdirToTrack(DiagdirToDiagTrackdir(dir)));
 		d_auto_delete.Detach();
+	}
 	return cost.AddCost(_price.build_train_depot);
+}
 /** Build signals, alternate between double/single, signal/semaphore,

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -20,13 +20,12 @@ @@
 #include "yapf/yapf.h"
 #include "depot_base.h"
 #include "depot_func.h"
 #include "newgrf.h"
 #include "station_map.h"
 #include "tunnel_map.h"
 #include "misc/autoptr.hpp"
 #include "variables.h"
 #include "autoslope.h"
 #include "transparency.h"
 #include "tunnelbridge_map.h"
 #include "window_func.h"
 #include "strings_func.h"
@@ @@ -814,22 +813,20 @@ CommandCost CmdBuildRoadDepot(TileIndex @@
 	CommandCost cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(cost)) return CMD_ERROR;
 	if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
 	Depot *dep = new Depot(tile);
 	if (dep == NULL) return CMD_ERROR;
 	AutoPtrT<Depot> d_auto_delete = dep;
 	if (!Depot::CanAllocateItem()) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		Depot *dep = new Depot(tile);
 		dep->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 		MakeRoadDepot(tile, _current_player, dir, rt);
 		MarkTileDirtyByTile(tile);
 		d_auto_delete.Detach();
+	}
 	return cost.AddCost(_price.build_road_depot);
+}
 static CommandCost RemoveRoadDepot(TileIndex tile, uint32 flags)
+{

src/ship_cmd.cpp

➞

Show inline comments

@@ @@ -25,13 +25,12 @@ @@
 #include "yapf/yapf.h"
 #include "debug.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_text.h"
 #include "newgrf_sound.h"
 #include "spritecache.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"

src/signs.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
 #include "player_func.h"
 #include "signs_base.h"
 #include "signs_func.h"
 #include "saveload.h"
 #include "command_func.h"
 #include "variables.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
 #include "viewport_func.h"
 #include "zoom_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "map_func.h"
@@ @@ -96,31 +95,29 @@ static void MarkSignDirty(Sign *si) @@
  * @param p1 unused
  * @param p2 unused
  */
 CommandCost CmdPlaceSign(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	/* Try to locate a new sign */
 	Sign *si = new Sign(_current_player);
 	if (si == NULL) return_cmd_error(STR_2808_TOO_MANY_SIGNS);
 	AutoPtrT<Sign> s_auto_delete = si;
 	if (!Sign::CanAllocateItem()) return_cmd_error(STR_2808_TOO_MANY_SIGNS);
 	/* When we execute, really make the sign */
 	if (flags & DC_EXEC) {
 		Sign *si = new Sign(_current_player);
 		int x = TileX(tile) * TILE_SIZE;
 		int y = TileY(tile) * TILE_SIZE;
 		si->x = x;
 		si->y = y;
 		si->z = GetSlopeZ(x, y);
 		UpdateSignVirtCoords(si);
 		MarkSignDirty(si);
 		InvalidateWindow(WC_SIGN_LIST, 0);
 		_sign_sort_dirty = true;
 		_new_sign_id = si->index;
 		_total_signs++;
 		s_auto_delete.Detach();
+	}
 	return CommandCost();
+}
 /** Rename a sign. If the new name of the sign is empty, we assume

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -28,13 +28,12 @@ @@
 #include "genworld.h"
 #include "newgrf.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_house.h"
 #include "newgrf_commons.h"
 #include "newgrf_townname.h"
 #include "misc/autoptr.hpp"
 #include "autoslope.h"
 #include "waypoint.h"
 #include "transparency.h"
 #include "tunnelbridge_map.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ @@ -1535,22 +1534,20 @@ CommandCost CmdBuildTown(TileIndex tile, @@
 	/* Get a unique name for the town. */
 	if (!CreateTownName(&townnameparts))
 		return_cmd_error(STR_023A_TOO_MANY_TOWNS);
 	/* Allocate town struct */
 	Town *t = new Town(tile);
 	if (t == NULL) return_cmd_error(STR_023A_TOO_MANY_TOWNS);
 	AutoPtrT<Town> t_auto_delete = t;
 	if (!Town::CanAllocateItem()) return_cmd_error(STR_023A_TOO_MANY_TOWNS);
 	/* Create the town */
 	if (flags & DC_EXEC) {
 		Town *t = new Town(tile);
 		_generating_world = true;
 		DoCreateTown(t, tile, townnameparts, (TownSizeMode)p2, p1);
 		_generating_world = false;
 		t_auto_delete.Detach();
+	}
 	return CommandCost();
+}
 Town *CreateRandomTown(uint attempts, TownSizeMode mode, uint size)
+{

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -21,13 +21,12 @@ @@
 #include "roadveh.h"
 #include "water.h"
 #include "water_map.h"
 #include "industry_map.h"
 #include "newgrf.h"
 #include "newgrf_canal.h"
 #include "misc/autoptr.hpp"
 #include "transparency.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
@@ @@ -198,24 +197,22 @@ CommandCost CmdBuildShipDepot(TileIndex @@
 	WaterClass wc2 = GetWaterClass(tile2);
 	ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(ret)) return CMD_ERROR;
 	ret = DoCommand(tile2, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(ret)) return CMD_ERROR;
 	Depot *depot = new Depot(tile);
 	if (depot == NULL) return CMD_ERROR;
 	AutoPtrT<Depot> d_auto_delete = depot;
 	if (!Depot::CanAllocateItem()) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		Depot *depot = new Depot(tile);
 		depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 		MakeShipDepot(tile,  _current_player, DEPOT_NORTH, axis, wc1);
 		MakeShipDepot(tile2, _current_player, DEPOT_SOUTH, axis, wc2);
 		MarkTileDirtyByTile(tile);
 		MarkTileDirtyByTile(tile2);
 		d_auto_delete.Detach();
+	}
 	return CommandCost(EXPENSES_CONSTRUCTION, _price.build_ship_depot);
+}
 void MakeWaterKeepingClass(TileIndex tile, Owner o)

src/waypoint.cpp

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ @@
 #include "station_base.h"
 #include "town.h"
 #include "waypoint.h"
 #include "variables.h"
 #include "yapf/yapf.h"
 #include "newgrf.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "economy_func.h"
 #include "date_func.h"
@@ @@ -188,13 +187,12 @@ void AfterLoadWaypoints() @@
  * @todo When checking for the tile slope,
  * distingush between "Flat land required" and "land sloped in wrong direction"
  */
 CommandCost CmdBuildTrainWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	Waypoint *wp;
 	AutoPtrT<Waypoint> wp_auto_delete;
 	Slope tileh;
 	Axis axis;
 	/* if custom gfx are used, make sure it is within bounds */
 	if (p1 >= GetNumCustomStations(STAT_CLASS_WAYP)) return CMD_ERROR;
@@ @@ -216,41 +214,41 @@ CommandCost CmdBuildTrainWaypoint(TileIn @@
+	}
 	if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
 	/* Check if there is an already existing, deleted, waypoint close to us that we can reuse. */
 	wp = FindDeletedWaypointCloseTo(tile);
 	if (wp == NULL) {
 		wp = new Waypoint(tile);
 		if (wp == NULL) return CMD_ERROR;
 	if (wp == NULL && !Waypoint::CanAllocateItem()) return CMD_ERROR;
 		wp_auto_delete = wp;
 	if (flags & DC_EXEC) {
 		if (wp == NULL) {
 			wp = new Waypoint(tile);
 			if (wp == NULL) return CMD_ERROR;
 			wp->town_index = INVALID_TOWN;
 			wp->name = NULL;
 			wp->town_cn = 0;
 		} else {
 			/* Move existing (recently deleted) waypoint to the new location */
 		wp->town_index = INVALID_TOWN;
 		wp->name = NULL;
 		wp->town_cn = 0;
 	} else if (flags & DC_EXEC) {
 		/* Move existing (recently deleted) waypoint to the new location */
 			/* First we update the destination for all vehicles that
 			* have the old waypoint in their orders. */
 			Vehicle *v;
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == VEH_TRAIN &&
 						v->First() == v &&
 						v->current_order.IsType(OT_GOTO_WAYPOINT) &&
 						v->dest_tile == wp->xy) {
 					v->dest_tile = tile;
+				}
+			}
 		/* First we update the destination for all vehicles that
 		 * have the old waypoint in their orders. */
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 			if (v->type == VEH_TRAIN &&
 					v->First() == v &&
 					v->current_order.IsType(OT_GOTO_WAYPOINT) &&
 					v->dest_tile == wp->xy) {
 				v->dest_tile = tile;
+			}
 			RedrawWaypointSign(wp);
 			wp->xy = tile;
+		}
 		RedrawWaypointSign(wp);
 		wp->xy = tile;
+	}
 	if (flags & DC_EXEC) {
 		const StationSpec* statspec;
 		MakeRailWaypoint(tile, GetTileOwner(tile), axis, GetRailType(tile), wp->index);
 		MarkTileDirtyByTile(tile);
 		statspec = GetCustomStationSpec(STAT_CLASS_WAYP, p1);
@@ @@ -271,13 +269,12 @@ CommandCost CmdBuildTrainWaypoint(TileIn @@
 		if (wp->town_index == INVALID_TOWN) MakeDefaultWaypointName(wp);
 		UpdateWaypointSign(wp);
 		RedrawWaypointSign(wp);
 		YapfNotifyTrackLayoutChange(tile, AxisToTrack(axis));
 		wp_auto_delete.Detach();
+	}
 	return CommandCost(EXPENSES_CONSTRUCTION, _price.build_train_depot);
+}
 /**

0 comments (0 inline, 0 general)