cpp/openttd-patchpack/source Changeset - r19949:26fad1c62a1b

Changeset - r19949:26fad1c62a1b

Parent rev.

Child rev.

[Not reviewed]

master

0 12 0

peter1138 - 12 years ago 2013-01-11 07:39:25
peter1138@openttd.org

(svn r24905) -Feature(ish): Implement station randomisation triggers.

12 files changed with 127 insertions and 11 deletions:

src/base_station_base.h

src/economy.cpp

src/newgrf.cpp

src/newgrf_station.cpp

src/newgrf_station.h

src/pathfinder/yapf/yapf_rail.cpp

src/pbs.cpp

src/pbs.h

src/saveload/station_sl.cpp

src/station_cmd.cpp

src/train_cmd.cpp

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/base_station_base.h

➞

Show inline comments

@@ @@ -68,12 +68,13 @@ struct BaseStation : StationPool::PoolIt @@
 	Date build_date;                ///< Date of construction
 	uint16 random_bits;             ///< Random bits assigned to this station
 	byte waiting_triggers;          ///< Waiting triggers (NewGRF) for this station
 	uint8 cached_anim_triggers;     ///< NOSAVE: Combined animation trigger bitmask, used to determine if trigger processing should happen.
 	uint32 cached_cargo_triggers;   ///< NOSAVE: Combined cargo trigger bitmask
 	TileArea train_station;         ///< Tile area the train 'station' part covers
 	StationRect rect;               ///< NOSAVE: Station spread out rectangle maintained by StationRect::xxx() functions
 	/**
 	 * Initialize the base station.

src/economy.cpp

➞

Show inline comments

@@ @@ -1532,12 +1532,13 @@ static void LoadUnloadVehicle(Vehicle *f @@
 			ge->cargo.MoveTo(&v->cargo, cap, StationCargoList::MTA_CARGO_LOAD, NULL, st->xy);
 			st->time_since_load = 0;
 			st->last_vehicle_type = v->type;
 			if (ge->cargo.Empty()) {
 				TriggerStationRandomisation(st, st->xy, SRT_CARGO_TAKEN, v->cargo_type);
 				TriggerStationAnimation(st, st->xy, SAT_CARGO_TAKEN, v->cargo_type);
 				AirportAnimationTrigger(st, AAT_STATION_CARGO_TAKEN, v->cargo_type);
+			}
 			unloading_time += cap;
@@ @@ -1549,13 +1550,16 @@ static void LoadUnloadVehicle(Vehicle *f @@
 		} else {
 			SetBit(cargo_not_full, v->cargo_type);
+		}
+	}
 	if (anything_loaded || anything_unloaded) {
 		if (front->type == VEH_TRAIN) TriggerStationAnimation(st, front->tile, SAT_TRAIN_LOADS);
 		if (front->type == VEH_TRAIN) {
 			TriggerStationRandomisation(st, front->tile, SRT_TRAIN_LOADS);
 			TriggerStationAnimation(st, front->tile, SAT_TRAIN_LOADS);
+		}
+	}
 	/* Only set completely_emptied, if we just unloaded all remaining cargo */
 	completely_emptied &= anything_unloaded;
 	/* For consists without autorefit-order we adjust the reserved cargo at the station after loading,

src/newgrf.cpp

➞

Show inline comments

@@ @@ -1905,12 +1905,15 @@ static ChangeInfoResult StationChangeInf @@
 			case 0x11: // Pylon placement
 				statspec->pylons = buf->ReadByte();
 				break;
 			case 0x12: // Cargo types for random triggers
 				statspec->cargo_triggers = buf->ReadDWord();
 				if (_cur.grffile->grf_version >= 7) {
 					statspec->cargo_triggers = TranslateRefitMask(statspec->cargo_triggers);
+				}
 				break;
 			case 0x13: // General flags
 				statspec->flags = buf->ReadByte();
 				break;

src/newgrf_station.cpp

➞

Show inline comments

@@ @@ -728,13 +728,13 @@ int AllocateSpecToStation(const StationS @@
+		}
 		st->speclist[i].spec     = statspec;
 		st->speclist[i].grfid    = statspec->grf_prop.grffile->grfid;
 		st->speclist[i].localidx = statspec->grf_prop.local_id;
-		StationUpdateAnimTriggers(st);
+		StationUpdateCachedTriggers(st);
+	}
 	return i;
+}
@@ @@ -770,17 +770,18 @@ void DeallocateSpecFromStation(BaseStati @@
 			st->speclist = ReallocT(st->speclist, st->num_specs);
 		} else {
 			free(st->speclist);
 			st->num_specs = 0;
 			st->speclist  = NULL;
 			st->cached_anim_triggers = 0;
 			st->cached_cargo_triggers = 0;
 			return;
+		}
+	}
-	StationUpdateAnimTriggers(st);
+	StationUpdateCachedTriggers(st);
+}
 /**
  * Draw representation of a station tile for GUI purposes.
  * @param x Position x of image.
  * @param y Position y of image.
@@ @@ -966,21 +967,106 @@ void TriggerStationAnimation(BaseStation @@
+			}
+		}
+	}
+}
 /**
  * Trigger station randomisation
  * @param st station being triggered
  * @param tile specific tile of platform to trigger
  * @param trigger trigger type
  * @param cargo_type cargo type causing trigger
  */
 void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigger trigger, CargoID cargo_type)
+{
 	/* List of coverage areas for each animation trigger */
 	static const TriggerArea tas[] = {
 		TA_WHOLE, TA_WHOLE, TA_PLATFORM, TA_PLATFORM, TA_PLATFORM, TA_PLATFORM
 	};
 	/* Get Station if it wasn't supplied */
 	if (st == NULL) st = Station::GetByTile(tile);
 	/* Check the cached cargo trigger bitmask to see if we need
 	 * to bother with any further processing. */
 	if (st->cached_cargo_triggers == 0) return;
 	if (cargo_type != CT_INVALID && !HasBit(st->cached_cargo_triggers, cargo_type)) return;
 	uint32 whole_reseed = 0;
 	ETileArea area = ETileArea(st, tile, tas[trigger]);
 	uint32 empty_mask = 0;
 	if (trigger == SRT_CARGO_TAKEN) {
 		/* Create a bitmask of completely empty cargo types to be matched */
 		for (CargoID i = 0; i < NUM_CARGO; i++) {
 			if (st->goods[i].cargo.Empty()) {
 				SetBit(empty_mask, i);
+			}
+		}
+	}
 	/* Convert trigger to bit */
 	uint8 trigger_bit = 1 << trigger;
 	/* Check all tiles over the station to check if the specindex is still in use */
 	TILE_AREA_LOOP(tile, area) {
 		if (st->TileBelongsToRailStation(tile)) {
 			const StationSpec *ss = GetStationSpec(tile);
 			if (ss == NULL) continue;
 			/* Cargo taken "will only be triggered if all of those
 			 * cargo types have no more cargo waiting." */
 			if (trigger == SRT_CARGO_TAKEN) {
 				if ((ss->cargo_triggers & ~empty_mask) != 0) continue;
+			}
 			if (cargo_type == CT_INVALID || HasBit(ss->cargo_triggers, cargo_type)) {
 				StationResolverObject object(ss, st, tile, CBID_RANDOM_TRIGGER, 0);
 				object.trigger = trigger_bit;
 				const SpriteGroup *group = ResolveStation(&object);
 				if (group == NULL) continue;
 				uint32 reseed = object.GetReseedSum();
 				if (reseed != 0) {
 					whole_reseed |= reseed;
 					reseed >>= 16;
 					/* Set individual tile random bits */
 					uint8 random_bits = GetStationTileRandomBits(tile);
 					random_bits &= ~reseed;
 					random_bits |= Random() & reseed;
 					SetStationTileRandomBits(tile, random_bits);
 					MarkTileDirtyByTile(tile);
+				}
+			}
+		}
+	}
 	/* Update whole station random bits */
 	if ((whole_reseed & 0xFFFF) != 0) {
 		st->random_bits &= ~whole_reseed;
 		st->random_bits |= Random() & whole_reseed;
+	}
+}
 /**
  * Update the cached animation trigger bitmask for a station.
  * @param st Station to update.
  */
-void StationUpdateAnimTriggers(BaseStation *st)
+void StationUpdateCachedTriggers(BaseStation *st)
+{
 	st->cached_anim_triggers = 0;
 	st->cached_cargo_triggers = 0;
 	/* Combine animation trigger bitmask for all station specs
 	 * of this station. */
 	for (uint i = 0; i < st->num_specs; i++) {
 		const StationSpec *ss = st->speclist[i].spec;
 		if (ss != NULL) st->cached_anim_triggers |= ss->animation.triggers;
 		if (ss != NULL) {
 			st->cached_anim_triggers |= ss->animation.triggers;
 			st->cached_cargo_triggers |= ss->cargo_triggers;
+		}
+	}
+}

src/newgrf_station.h

➞

Show inline comments

@@ @@ -87,12 +87,22 @@ enum StationSpecFlags { @@
 	SSF_DIV_BY_STATION_SIZE,  ///< Divide cargo amount by station size.
 	SSF_CB141_RANDOM_BITS,    ///< Callback 141 needs random bits.
 	SSF_CUSTOM_FOUNDATIONS,   ///< Draw custom foundations.
 	SSF_EXTENDED_FOUNDATIONS, ///< Extended foundation block instead of simple.
 };
 /** Randomisation triggers for stations */
 enum StationRandomTrigger {
 	SRT_NEW_CARGO,        ///< Trigger station on new cargo arrival.
 	SRT_CARGO_TAKEN,      ///< Trigger station when cargo is completely taken.
 	SRT_TRAIN_ARRIVES,    ///< Trigger platform when train arrives.
 	SRT_TRAIN_DEPARTS,    ///< Trigger platform when train leaves.
 	SRT_TRAIN_LOADS,      ///< Trigger platform when train loads/unloads.
 	SRT_PATH_RESERVATION, ///< Trigger platform when train reserves path.
 };
 /* Station layout for given dimensions - it is a two-dimensional array
  * where index is computed as (x * platforms) + platform. */
 typedef byte *StationLayout;
 /** Station specification. */
 struct StationSpec {
@@ @@ -173,9 +183,10 @@ void DeallocateSpecFromStation(BaseStati @@
 /* Draw representation of a station tile for GUI purposes. */
 bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID sclass, uint station);
 void AnimateStationTile(TileIndex tile);
 void TriggerStationAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoID cargo_type = CT_INVALID);
 void StationUpdateAnimTriggers(BaseStation *st);
 void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigger trigger, CargoID cargo_type = CT_INVALID);
 void StationUpdateCachedTriggers(BaseStation *st);
 #endif /* NEWGRF_STATION_H */

src/pathfinder/yapf/yapf_rail.cpp

➞

Show inline comments

@@ @@ -14,12 +14,13 @@ @@
 #include "yapf.hpp"
 #include "yapf_cache.h"
 #include "yapf_node_rail.hpp"
 #include "yapf_costrail.hpp"
 #include "yapf_destrail.hpp"
 #include "../../viewport_func.h"
 #include "../../newgrf_station.h"
 #define DEBUG_YAPF_CACHE 0
 #if DEBUG_YAPF_CACHE
 template <typename Tpf> void DumpState(Tpf &pf1, Tpf &pf2)
+{
@@ @@ -80,12 +81,14 @@ private: @@
 			if (HasStationReservation(tile)) return false;
 			SetRailStationReservation(tile, true);
 			MarkTileDirtyByTile(tile);
 			tile = TILE_ADD(tile, diff);
 		} while (IsCompatibleTrainStationTile(tile, start) && tile != m_origin_tile);
 		TriggerStationRandomisation(NULL, start, SRT_PATH_RESERVATION);
 		return true;
+	}
 	/** Try to reserve a single track/platform. */
 	bool ReserveSingleTrack(TileIndex tile, Trackdir td)
+	{

src/pbs.cpp

➞

Show inline comments

@@ @@ -9,12 +9,13 @@ @@
 /** @file pbs.cpp PBS support routines */
 #include "stdafx.h"
 #include "viewport_func.h"
 #include "vehicle_func.h"
 #include "newgrf_station.h"
 #include "pathfinder/follow_track.hpp"
 /**
  * Get the reserved trackbits for any tile, regardless of type.
  * @param t the tile
  * @return the reserved trackbits. TRACK_BIT_NONE on nothing reserved or
@@ @@ -69,16 +70,17 @@ void SetRailStationPlatformReservation(T @@
+}
 /**
  * Try to reserve a specific track on a tile
  * @param tile the tile
  * @param t the track
  * @param trigger_stations whether to call station randomisation trigger
  * @return \c true if reservation was successful, i.e. the track was
  *     free and didn't cross any other reserved tracks.
  */
 bool TryReserveRailTrack(TileIndex tile, Track t)
+bool TryReserveRailTrack(TileIndex tile, Track t, bool trigger_stations)
+{
 	assert((GetTileTrackStatus(tile, TRANSPORT_RAIL, 0) & TrackToTrackBits(t)) != 0);
 	if (_settings_client.gui.show_track_reservation) {
 		/* show the reserved rail if needed */
 		MarkTileDirtyByTile(tile);
@@ @@ -105,12 +107,13 @@ bool TryReserveRailTrack(TileIndex tile, @@
+			}
 			break;
 		case MP_STATION:
 			if (HasStationRail(tile) && !HasStationReservation(tile)) {
 				SetRailStationReservation(tile, true);
 				if (trigger_stations) TriggerStationRandomisation(NULL, tile, SRT_PATH_RESERVATION);
 				MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track
 				return true;
+			}
 			break;
 		case MP_TUNNELBRIDGE:

src/pbs.h

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
 #include "vehicle_type.h"
 TrackBits GetReservedTrackbits(TileIndex t);
 void SetRailStationPlatformReservation(TileIndex start, DiagDirection dir, bool b);
 bool TryReserveRailTrack(TileIndex tile, Track t);
+bool TryReserveRailTrack(TileIndex tile, Track t, bool trigger_stations = true);
 void UnreserveRailTrack(TileIndex tile, Track t);
 /** This struct contains information about the end of a reserved path. */
 struct PBSTileInfo {
 	TileIndex tile;      ///< Tile the path ends, INVALID_TILE if no valid path was found.
 	Trackdir  trackdir;  ///< The reserved trackdir on the tile.

src/saveload/station_sl.cpp

➞

Show inline comments

@@ @@ -120,13 +120,13 @@ void AfterLoadStations() @@
 		if (Station::IsExpected(st)) {
 			Station *sta = Station::From(st);
 			for (const RoadStop *rs = sta->bus_stops; rs != NULL; rs = rs->next) sta->bus_station.Add(rs->xy);
 			for (const RoadStop *rs = sta->truck_stops; rs != NULL; rs = rs->next) sta->truck_station.Add(rs->xy);
+		}
-		StationUpdateAnimTriggers(st);
+		StationUpdateCachedTriggers(st);
+	}
+}
 /**
  * (Re)building of road stop caches after loading a savegame.
  */

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -3377,12 +3377,13 @@ static uint UpdateStationWaiting(Station @@
 	if (!HasBit(ge.acceptance_pickup, GoodsEntry::GES_PICKUP)) {
 		InvalidateWindowData(WC_STATION_LIST, st->index);
 		SetBit(ge.acceptance_pickup, GoodsEntry::GES_PICKUP);
+	}
 	TriggerStationRandomisation(st, st->xy, SRT_NEW_CARGO, type);
 	TriggerStationAnimation(st, st->xy, SAT_NEW_CARGO, type);
 	AirportAnimationTrigger(st, AAT_STATION_NEW_CARGO, type);
 	SetWindowDirty(WC_STATION_VIEW, st->index);
 	st->MarkTilesDirty(true);
 	return amount;

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -2807,12 +2807,13 @@ static void TrainEnterStation(Train *v, @@
 	v->force_proceed = TFP_NONE;
 	SetWindowDirty(WC_VEHICLE_VIEW, v->index);
 	v->BeginLoading();
 	TriggerStationRandomisation(st, v->tile, SRT_TRAIN_ARRIVES);
 	TriggerStationAnimation(st, v->tile, SAT_TRAIN_ARRIVES);
+}
 /* Check if the vehicle is compatible with the specified tile */
 static inline bool CheckCompatibleRail(const Train *v, TileIndex tile)
+{
@@ @@ -3181,13 +3182,13 @@ bool TrainController(Train *v, Vehicle * @@
 								UpdateSignalsOnSegment(v->tile, enterdir, v->owner) == SIGSEG_PBS) {
 							v->wait_counter = 0;
 							return false;
+						}
 						goto reverse_train_direction;
 					} else {
 						TryReserveRailTrack(gp.new_tile, TrackBitsToTrack(chosen_track));
+						TryReserveRailTrack(gp.new_tile, TrackBitsToTrack(chosen_track), false);
+					}
 				} else {
 					/* The wagon is active, simply follow the prev vehicle. */
 					if (prev->tile == gp.new_tile) {
 						/* Choose the same track as prev */
 						if (prev->track == TRACK_BIT_WORMHOLE) {

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1998,13 +1998,16 @@ void Vehicle::LeaveStation() @@
 	st->loading_vehicles.remove(this);
 	HideFillingPercent(&this->fill_percent_te_id);
 	if (this->type == VEH_TRAIN && !(this->vehstatus & VS_CRASHED)) {
 		/* Trigger station animation (trains only) */
 		if (IsTileType(this->tile, MP_STATION)) TriggerStationAnimation(st, this->tile, SAT_TRAIN_DEPARTS);
 		if (IsTileType(this->tile, MP_STATION)) {
 			TriggerStationRandomisation(st, this->tile, SRT_TRAIN_DEPARTS);
 			TriggerStationAnimation(st, this->tile, SAT_TRAIN_DEPARTS);
+		}
 		SetBit(Train::From(this)->flags, VRF_LEAVING_STATION);
+	}
+}

0 comments (0 inline, 0 general)