openttd-ottdgrfs: comparison src/station

equal deleted inserted replaced

-:f40e88cff863
+:646711c5feaa
 	{
 		Station *s;
 		FOR_ALL_STATIONS(s) {
-			if (s != st && s->town==t) {
+			if (s != st && s->town == t) {
 				uint str = M(s->string_id);
 				if (str <= 0x20) {
 					if (str == M(STR_SV_STNAME_FOREST))
 						str = M(STR_SV_STNAME_WOODS);
 					CLRBIT(free_names, str);
 			goto done;
 		}
 	}
 	/* check close enough to town to get central as name? */
-	if (DistanceMax(tile,t->xy) < 8) {
+	if (DistanceMax(tile, t->xy) < 8) {
 		found = M(STR_SV_STNAME);
 		if (HASBIT(free_names, M(STR_SV_STNAME))) goto done;
 		found = M(STR_SV_STNAME_CENTRAL);
 		if (HASBIT(free_names, M(STR_SV_STNAME_CENTRAL))) goto done;
 	}
 	/* check direction compared to town */
 	{
 		static const int8 _direction_and_table[] = {
-			~( (1<<M(STR_SV_STNAME_WEST)) | (1<<M(STR_SV_STNAME_EAST)) | (1<<M(STR_SV_STNAME_NORTH)) ),
+			~( (1 << M(STR_SV_STNAME_WEST)) | (1 << M(STR_SV_STNAME_EAST)) | (1 << M(STR_SV_STNAME_NORTH)) ),
-			~( (1<<M(STR_SV_STNAME_SOUTH)) | (1<<M(STR_SV_STNAME_WEST)) | (1<<M(STR_SV_STNAME_NORTH)) ),
+			~( (1 << M(STR_SV_STNAME_SOUTH)) | (1 << M(STR_SV_STNAME_WEST)) | (1 << M(STR_SV_STNAME_NORTH)) ),
-			~( (1<<M(STR_SV_STNAME_SOUTH)) | (1<<M(STR_SV_STNAME_EAST)) | (1<<M(STR_SV_STNAME_NORTH)) ),
+			~( (1 << M(STR_SV_STNAME_SOUTH)) | (1 << M(STR_SV_STNAME_EAST)) | (1 << M(STR_SV_STNAME_NORTH)) ),
-			~( (1<<M(STR_SV_STNAME_SOUTH)) | (1<<M(STR_SV_STNAME_WEST)) | (1<<M(STR_SV_STNAME_EAST)) ),
+			~( (1 << M(STR_SV_STNAME_SOUTH)) | (1 << M(STR_SV_STNAME_WEST)) | (1 << M(STR_SV_STNAME_EAST)) ),
 		};
 		free_names &= _direction_and_table[
 			(TileX(tile) < TileX(t->xy)) +
 			(TileY(tile) < TileY(t->xy)) * 2];
 	}
-	tmp = free_names & ((1<<1)|(1<<2)|(1<<3)|(1<<4)|(1<<6)|(1<<7)|(1<<12)|(1<<26)|(1<<27)|(1<<28)|(1<<29)|(1<<30));
+	tmp = free_names & ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 6) | (1 << 7) | (1 << 12) | (1 << 26) | (1 << 27) | (1 << 28) | (1 << 29) | (1 << 30));
 	if (tmp == 0) {
 		_error_message = STR_3007_TOO_MANY_STATIONS_LOADING;
 		return false;
 	}
 	found = FindFirstBit(tmp);
 	for (uint i = 0; i < num_items; i++) {
 		SetDParam(i + 1, GetCargo(cargo[i])->name);
 	}
 	SetDParam(0, st->index);
-	AddNewsItem(msg, NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_TILE, NT_ACCEPTANCE, 0), st->xy, 0);
+	AddNewsItem(msg, NEWS_FLAGS(NM_SMALL, NF_VIEWPORT | NF_TILE, NT_ACCEPTANCE, 0), st->xy, 0);
 }
 // Get a list of the cargo types being produced around the tile.
 void GetProductionAroundTiles(AcceptedCargo produced, TileIndex tile,
 	int w, int h, int rad)
 		}
 		int flat_z = z;
 		if (tileh != SLOPE_FLAT) {
 			// need to check so the entrance to the station is not pointing at a slope.
-			if ((invalid_dirs&1 && !(tileh & SLOPE_NE) && (uint)w_cur == w) ||
+			if ((invalid_dirs & 1 && !(tileh & SLOPE_NE) && (uint)w_cur == w) ||
-					(invalid_dirs&2 && !(tileh & SLOPE_SE) && h_cur == 1) ||
+					(invalid_dirs & 2 && !(tileh & SLOPE_SE) && h_cur == 1) ||
-					(invalid_dirs&4 && !(tileh & SLOPE_SW) && w_cur == 1) ||
+					(invalid_dirs & 4 && !(tileh & SLOPE_SW) && w_cur == 1) ||
-					(invalid_dirs&8 && !(tileh & SLOPE_NW) && (uint)h_cur == h)) {
+					(invalid_dirs & 8 && !(tileh & SLOPE_NW) && (uint)h_cur == h)) {
 				return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
 			}
 			cost += _price.terraform;
 			flat_z += TILE_HEIGHT;
 		}
 static inline byte *CreateSingle(byte *layout, int n)
 {
 	int i = n;
 	do *layout++ = 0; while (--i);
-	layout[((n-1) >> 1)-n] = 2;
+	layout[((n - 1) >> 1) - n] = 2;
 	return layout;
 }
 static inline byte *CreateMulti(byte *layout, int n, byte b)
 {
 	int i = n;
 	do *layout++ = b; while (--i);
 	if (n > 4) {
-		layout[0-n] = 0;
+		layout[0 - n] = 0;
-		layout[n-1-n] = 0;
+		layout[n - 1 - n] = 0;
 	}
 	return layout;
 }
 static void GetStationLayout(byte *layout, int numtracks, int plat_len, const StationSpec *statspec)
 	}
 }
 /** Build railroad station
 * @param tile_org starting position of station dragging/placement
+* @param flags operation to perform
 * @param p1 various bitstuffed elements
 * - p1 = (bit  0)    - orientation (Axis)
 * - p1 = (bit  8-15) - number of tracks
 * - p1 = (bit 16-23) - platform length
 * @param p2 various bitstuffed elements
 }
 /** Remove a single tile from a railroad station.
 * This allows for custom-built station with holes and weird layouts
 * @param tile tile of station piece to remove
+* @param flags operation to perform
 * @param p1 unused
 * @param p2 unused
 */
 int32 CmdRemoveFromRailroadStation(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	return _price.build_rail / 2;
 }
 /**
-* @param[in] truck_station Determines whether a stop is RoadStop::BUS or RoadStop::TRUCK
+* @param truck_station Determines whether a stop is RoadStop::BUS or RoadStop::TRUCK
-* @param[in] station The station to do the whole procedure for
+* @param st The Station to do the whole procedure for
 * @return a pointer to where to link a new RoadStop*
 */
 static RoadStop **FindRoadStopSpot(bool truck_station, Station* st)
 {
 	RoadStop **primary_stop = (truck_station) ? &st->truck_stops : &st->bus_stops;
 	if (*primary_stop == NULL) {
-		//we have no roadstop of the type yet, so write a "primary stop"
+		/* we have no roadstop of the type yet, so write a "primary stop" */
 		return primary_stop;
 	} else {
-		//there are stops already, so append to the end of the list
+		/* there are stops already, so append to the end of the list */
 		RoadStop *stop = *primary_stop;
 		while (stop->next != NULL) stop = stop->next;
 		return &stop->next;
 	}
 }
 /** Build a bus or truck stop
 * @param tile tile to build the stop at
+* @param flags operation to perform
 * @param p1 entrance direction (DiagDirection)
 * @param p2 bit 0: 0 for Bus stops, 1 for truck stops
 *           bit 1: 0 for normal, 1 for drive-through
 */
 int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	return (is_truck) ? _price.remove_truck_station : _price.remove_bus_station;
 }
 /** Remove a bus or truck stop
 * @param tile tile to remove the stop from
+* @param flags operation to perform
 * @param p1 not used
 * @param p2 bit 0: 0 for Bus stops, 1 for truck stops
 */
 int32 CmdRemoveRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	_airport_sections_helistation        // Helistation
 };
 /** Place an Airport.
 * @param tile tile where airport will be built
+* @param flags operation to perform
 * @param p1 airport type, @see airport.h
 * @param p2 unused
 */
 int32 CmdBuildAirport(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 		if (flags & DC_EXEC) {
 			DeleteAnimatedTile(tile_cur);
 			DoClearSquare(tile_cur);
 		}
-	} END_TILE_LOOP(tile_cur, w,h,tile)
+	} END_TILE_LOOP(tile_cur, w, h, tile)
 	if (flags & DC_EXEC) {
 		for (uint i = 0; i < afc->nof_depots; ++i) {
 			DeleteWindowById(
 				WC_VEHICLE_DEPOT, tile + ToTileIndexDiff(afc->airport_depots[i])
 	return cost;
 }
 /** Build a buoy.
 * @param tile tile where to place the bouy
+* @param flags operation to perform
 * @param p1 unused
 * @param p2 unused
 */
 int32 CmdBuildBuoy(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 static const byte _dock_w_chk[4] = { 2, 1, 2, 1 };
 static const byte _dock_h_chk[4] = { 1, 2, 1, 2 };
 /** Build a dock/haven.
 * @param tile tile where dock will be built
+* @param flags operation to perform
 * @param p1 unused
 * @param p2 unused
 */
 int32 CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	st->MarkTilesDirty();
 }
 /** Rename a station
 * @param tile unused
+* @param flags operation to perform
 * @param p1 station ID that is to be renamed
 * @param p2 unused
 */
 int32 CmdRenameStation(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	/* Used by newstations for graphic variations */
 	SLE_CONDVAR(Station, random_bits,                SLE_UINT16,                 27, SL_MAX_VERSION),
 	SLE_CONDVAR(Station, waiting_triggers,           SLE_UINT8,                  27, SL_MAX_VERSION),
 	SLE_CONDVAR(Station, num_specs,                  SLE_UINT8,                  27, SL_MAX_VERSION),
+	SLE_CONDLST(Station, loading_vehicles,           REF_VEHICLE,                57, SL_MAX_VERSION),
 	// reserve extra space in savegame here. (currently 32 bytes)
 	SLE_CONDNULL(32, 2, SL_MAX_VERSION),
 	SLE_END()
 };
 static void SaveLoad_STNS(Station *st)
 {
 	SlObject(st, _station_desc);
-	for (CargoID i = 0; i < NUM_CARGO; i++) {
+	uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO;
+	for (CargoID i = 0; i < num_cargo; i++) {
 		SlObject(&st->goods[i], _goods_desc);
 	}
 	if (st->num_specs != 0) {
 		/* Allocate speclist memory when loading a game */

branch	cpp_gui
changeset 6308	646711c5feaa
parent 6307	f40e88cff863