cpp/openttd-patchpack/source Changeset - r7813:e50a8d29e5a0

Changeset - r7813:e50a8d29e5a0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 17 years ago 2007-10-31 18:01:41
belugas@openttd.org

(svn r11363) -Codechange: Remove some magical numbers

1 file changed with 16 insertions and 6 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -217,24 +217,34 @@ static bool CMSAForest(TileIndex tile) @@
 	if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
 	for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
 		/* The industry produces wood. */
 		if (ind->produced_cargo[i] != CT_INVALID && GetCargo(ind->produced_cargo[i])->label == 'WOOD') return true;
+	}
 	return false;
+}
 #define M(x) ((x) - STR_SV_STNAME)
 enum StationNaming = {
 	STATIONNAMING_RAIL = 0,
 	STATIONNAMING_ROAD = 0,
 	STATIONNAMING_AIRPORT,
 	STATIONNAMING_OILRIG,
 	STATIONNAMING_DOCK,
 	STATIONNAMING_BUOY,
 	STATIONNAMING_HELIPORT,
+}
 static bool GenerateStationName(Station *st, TileIndex tile, int flag)
+{
 	static const uint32 _gen_station_name_bits[] = {
 ,                                      /* 0 */
 << M(STR_SV_STNAME_AIRPORT),          /* 1 */
 << M(STR_SV_STNAME_OILFIELD),         /* 2 */
 << M(STR_SV_STNAME_DOCKS),            /* 3 */
 x1FF << M(STR_SV_STNAME_BUOY_1),       /* 4 */
 << M(STR_SV_STNAME_HELIPORT),         /* 5 */
 	};
 	Town *t = st->town;
@@ @@ -953,25 +963,25 @@ CommandCost CmdBuildRailroadStation(Tile @@
 		/* XXX can't we pack this in the "else" part of the if above? */
 		if (!st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TEST)) return CMD_ERROR;
 	} else {
 		/* allocate and initialize new station */
 		st = new Station(tile_org);
 		if (st == NULL) return_cmd_error(STR_3008_TOO_MANY_STATIONS_LOADING);
 		/* ensure that in case of error (or no DC_EXEC) the station gets deleted upon return */
 		st_auto_delete = st;
 		st->town = ClosestTownFromTile(tile_org, (uint)-1);
-		if (!GenerateStationName(st, tile_org, 0)) return CMD_ERROR;
+		if (!GenerateStationName(st, tile_org, STATIONNAMING_RAIL)) return CMD_ERROR;
 		if (IsValidPlayer(_current_player) && (flags & DC_EXEC) != 0) {
 			SETBIT(st->town->have_ratings, _current_player);
+		}
+	}
 	/* Check if the given station class is valid */
 	if (GB(p2, 8, 8) >= STAT_CLASS_MAX) return CMD_ERROR;
 	/* Check if we can allocate a custom stationspec to this station */
 	const StationSpec *statspec = GetCustomStationSpec((StationClassID)GB(p2, 8, 8), GB(p2, 16, 8));
 	int specindex = AllocateSpecToStation(statspec, st, flags & DC_EXEC);
@@ @@ -1378,25 +1388,25 @@ CommandCost CmdBuildRoadStop(TileIndex t @@
 		if (!st->rect.BeforeAddTile(tile, StationRect::ADD_TEST)) return CMD_ERROR;
 	} else {
 		/* allocate and initialize new station */
 		st = new Station(tile);
 		if (st == NULL) return_cmd_error(STR_3008_TOO_MANY_STATIONS_LOADING);
 		/* ensure that in case of error (or no DC_EXEC) the new station gets deleted upon return */
 		st_auto_delete = st;
 		Town *t = st->town = ClosestTownFromTile(tile, (uint)-1);
-		if (!GenerateStationName(st, tile, 0)) return CMD_ERROR;
+		if (!GenerateStationName(st, tile, STATIONNAMING_ROAD)) return CMD_ERROR;
 		if (IsValidPlayer(_current_player) && (flags & DC_EXEC) != 0) {
 			SETBIT(t->have_ratings, _current_player);
+		}
 		st->sign.width_1 = 0;
+	}
 	cost.AddCost((type) ? _price.build_truck_station : _price.build_bus_station);
 	if (flags & DC_EXEC) {
 		/* Insert into linked list of RoadStops */
@@ @@ -1686,25 +1696,25 @@ CommandCost CmdBuildAirport(TileIndex ti @@
 		st_auto_delete = st;
 		st->town = t;
 		if (IsValidPlayer(_current_player) && (flags & DC_EXEC) != 0) {
 			SETBIT(t->have_ratings, _current_player);
+		}
 		st->sign.width_1 = 0;
 		/* If only helicopters may use the airport generate a helicopter related (5)
 		 * station name, otherwise generate a normal airport name (1) */
-		if (!GenerateStationName(st, tile, !(afc->flags & AirportFTAClass::AIRPLANES) ? 5 : 1)) {
+		if (!GenerateStationName(st, tile, !(afc->flags & AirportFTAClass::AIRPLANES) ? STATIONNAMING_HELIPORT : STATIONNAMING_AIRPORT)) {
 			return CMD_ERROR;
+		}
+	}
 	cost.AddCost(_price.build_airport * w * h);
 	if (flags & DC_EXEC) {
 		st->airport_tile = tile;
 		st->AddFacility(FACIL_AIRPORT, tile);
 		st->airport_type = (byte)p1;
 		st->airport_flags = 0;
@@ @@ -1801,25 +1811,25 @@ CommandCost CmdBuildBuoy(TileIndex tile, @@
 	if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
 	/* allocate and initialize new station */
 	Station *st = new Station(tile);
 	if (st == NULL) return_cmd_error(STR_3008_TOO_MANY_STATIONS_LOADING);
 	/* ensure that in case of error (or no DC_EXEC) the station gets deleted upon return */
 	AutoPtrT<Station> st_auto_delete(st);
 	st->town = ClosestTownFromTile(tile, (uint)-1);
 	st->sign.width_1 = 0;
-	if (!GenerateStationName(st, tile, 4)) return CMD_ERROR;
+	if (!GenerateStationName(st, tile, STATIONNAMING_BUOY)) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		st->dock_tile = tile;
 		st->facilities |= FACIL_DOCK;
 		/* Buoys are marked in the Station struct by this flag. Yes, it is this
 		 * braindead.. */
 		st->had_vehicle_of_type |= HVOT_BUOY;
 		st->owner = OWNER_NONE;
 		st->build_date = _date;
 		MakeBuoy(tile, st->index);
@@ @@ -1971,25 +1981,25 @@ CommandCost CmdBuildDock(TileIndex tile, @@
 		/* ensure that in case of error (or no DC_EXEC) the station gets deleted upon return */
 		st_auto_delete = st;
 		Town *t = st->town = ClosestTownFromTile(tile, (uint)-1);
 		if (IsValidPlayer(_current_player) && (flags & DC_EXEC) != 0) {
 			SETBIT(t->have_ratings, _current_player);
+		}
 		st->sign.width_1 = 0;
-		if (!GenerateStationName(st, tile, 3)) return CMD_ERROR;
+		if (!GenerateStationName(st, tile, STATIONNAMING_DOCK)) return CMD_ERROR;
+	}
 	if (flags & DC_EXEC) {
 		st->dock_tile = tile;
 		st->AddFacility(FACIL_DOCK, tile);
 		st->rect.BeforeAddRect(tile, _dock_w_chk[direction], _dock_h_chk[direction], StationRect::ADD_TRY);
 		MakeDock(tile, st->owner, st->index, direction);
 		UpdateStationVirtCoordDirty(st);
 		UpdateStationAcceptance(st, false);
@@ @@ -2740,25 +2750,25 @@ uint MoveGoodsToStation(TileIndex tile, @@
 	return moved;
+}
 void BuildOilRig(TileIndex tile)
+{
 	Station *st = new Station();
 	if (st == NULL) {
 		DEBUG(misc, 0, "Can't allocate station for oilrig at 0x%X, reverting to oilrig only", tile);
 		return;
+	}
-	if (!GenerateStationName(st, tile, 2)) {
+	if (!GenerateStationName(st, tile, STATIONNAMING_OILRIG)) {
 		DEBUG(misc, 0, "Can't allocate station-name for oilrig at 0x%X, reverting to oilrig only", tile);
 		return;
+	}
 	st->town = ClosestTownFromTile(tile, (uint)-1);
 	st->sign.width_1 = 0;
 	MakeOilrig(tile, st->index);
 	st->owner = OWNER_NONE;
 	st->airport_flags = 0;
 	st->airport_type = AT_OILRIG;

0 comments (0 inline, 0 general)