cpp/openttd-patchpack/source Changeset - r3765:c9eaea3d3f78

Changeset - r3765:c9eaea3d3f78

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

peter1138 - 18 years ago 2006-05-06 21:46:26
peter1138@openttd.org

(svn r4757) - Newstations: add saveload support for custom station speclists

6 files changed with 53 insertions and 2 deletions:

newgrf_station.c

newgrf_station.h

openttd.c

saveload.c

station.h

station_cmd.c

0 comments (0 inline, 0 general)

newgrf_station.c

➞

Show inline comments

@@ @@ -161,12 +161,29 @@ const StationSpec *GetCustomStationSpec( @@
 	// If the custom station isn't defined any more, then the GRF file
 	// probably was not loaded.
 	return NULL;
+}
 const StationSpec *GetCustomStationSpecByGrf(uint32 grfid, byte localidx)
+{
 	StationClassID i;
 	uint j;
 	for (i = STAT_CLASS_DFLT; i < STAT_CLASS_MAX; i++) {
 		for (j = 0; j < station_classes[i].stations; j++) {
 			const StationSpec *statspec = station_classes[i].spec[j];
 			if (statspec == NULL) continue;
 			if (statspec->grfid == grfid && statspec->localidx == localidx) return statspec;
+		}
+	}
 	return NULL;
+}
 /* Evaluate a tile's position within a station, and return the result a bitstuffed format.
  * if not centred: .TNLcCpP, if centred: .TNL..CP
  * T = Tile layout number (GetStationGfx), N = Number of platforms, L = Length of platforms
  * C = Current platform number from start, c = from end
  * P = Position along platform from start, p = from end
  * if centred, C/P start from the centre and c/p are not available.

newgrf_station.h

➞

Show inline comments

@@ @@ -91,12 +91,13 @@ StringID *BuildStationClassDropdown(void @@
 uint GetNumStationClasses(void);
 uint GetNumCustomStations(StationClassID sclass);
 void SetCustomStationSpec(StationSpec *statspec);
 const StationSpec *GetCustomStationSpec(StationClassID sclass, uint station);
 const StationSpec *GetCustomStationSpecByGrf(uint32 grfid, byte localidx);
 /* Get sprite offset for a given custom station and station structure (may be
  * NULL - that means we are in a build dialog). The station structure is used
  * for variational sprite groups. */
 SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile);
 uint16 GetStationCallback(uint16 callback, uint32 param1, uint32 param2, const StationSpec *statspec, const Station *st, TileIndex tile);

openttd.c

➞

Show inline comments

@@ @@ -1423,8 +1423,10 @@ bool AfterLoadGame(void) @@
 			st->last_vehicle_type = VEH_Invalid;
+		}
+	}
 	FOR_ALL_PLAYERS(p) p->avail_railtypes = GetPlayerRailtypes(p->index);
 	if (!CheckSavegameVersion(27)) AfterLoadStations();
 	return true;
+}

saveload.c

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ @@
 #include "player.h"
 #include "saveload.h"
 #include "network.h"
 #include "variables.h"
 #include <setjmp.h>
-const uint16 SAVEGAME_VERSION = 26;
+const uint16 SAVEGAME_VERSION = 27;
 uint16 _sl_version;       /// the major savegame version identifier
 byte   _sl_minor_version; /// the minor savegame version, DO NOT USE!
 typedef void WriterProc(uint len);
 typedef uint ReaderProc(void);

station.h

➞

Show inline comments

@@ @@ -191,12 +191,13 @@ static inline uint16 GetRoadStopPoolSize @@
 /* End of stuff for ROADSTOPS */
 VARDEF bool _station_sort_dirty[MAX_PLAYERS];
 VARDEF bool _global_station_sort_dirty;
 void AfterLoadStations(void);
 void GetProductionAroundTiles(AcceptedCargo produced, TileIndex tile, int w, int h, int rad);
 void GetAcceptanceAroundTiles(AcceptedCargo accepts, TileIndex tile, int w, int h, int rad);
 uint GetStationPlatforms(const Station *st, TileIndex tile);
 const DrawTileSprites *GetStationTileLayout(byte gfx);

station_cmd.c

➞

Show inline comments

@@ @@ -2818,12 +2818,28 @@ void InitializeStations(void) @@
 	// set stations to be sorted on load of savegame
 	memset(_station_sort_dirty, true, sizeof(_station_sort_dirty));
 	_global_station_sort_dirty = true; // load of savegame
+}
 void AfterLoadStations(void)
+{
 	Station *st;
 	uint i;
 	/* Update the speclists of all stations to point to the currently loaded custom stations. */
 	FOR_ALL_STATIONS(st) {
 		for (i = 0; i < st->num_specs; i++) {
 			if (st->speclist[i].grfid == 0) continue;
 			st->speclist[i].spec = GetCustomStationSpecByGrf(st->speclist[i].grfid, st->speclist[i].localidx);
+		}
+	}
+}
 const TileTypeProcs _tile_type_station_procs = {
 	DrawTile_Station,           /* draw_tile_proc */
 	GetSlopeZ_Station,          /* get_slope_z_proc */
 	ClearTile_Station,          /* clear_tile_proc */
 	GetAcceptedCargo_Station,   /* get_accepted_cargo_proc */
 	GetTileDesc_Station,        /* get_tile_desc_proc */
@@ @@ -2903,12 +2919,13 @@ static const SaveLoad _station_desc[] = @@
 	SLE_CONDREF(Station,bus_stops,         REF_ROADSTOPS, 6, SL_MAX_VERSION),
 	SLE_CONDREF(Station,truck_stops,       REF_ROADSTOPS, 6, SL_MAX_VERSION),
 	/* 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),
 	// reserve extra space in savegame here. (currently 32 bytes)
 	SLE_CONDNULL(32, 2, SL_MAX_VERSION),
 	SLE_END()
 };
@@ @@ -2924,26 +2941,39 @@ static const SaveLoad _goods_desc[] = { @@
 	SLE_VAR(GoodsEntry,last_age,           SLE_UINT8),
 	SLE_CONDVAR(GoodsEntry,feeder_profit,  SLE_INT32, 14, SL_MAX_VERSION),
 	SLE_END()
 };
 static const SaveLoad _station_speclist_desc[] = {
 	SLE_CONDVAR(StationSpecList, grfid,    SLE_UINT32, 27, SL_MAX_VERSION),
 	SLE_CONDVAR(StationSpecList, localidx, SLE_UINT8,  27, SL_MAX_VERSION),
 	SLE_END()
 };
 static void SaveLoad_STNS(Station *st)
+{
-	int i;
+	uint i;
 	SlObject(st, _station_desc);
 	for (i = 0; i != NUM_CARGO; i++) {
 		SlObject(&st->goods[i], _goods_desc);
 		/* In older versions, enroute_from had 0xFF as INVALID_STATION, is now 0xFFFF */
 		if (CheckSavegameVersion(7) && st->goods[i].enroute_from == 0xFF) {
 			st->goods[i].enroute_from = INVALID_STATION;
+		}
+	}
 	if (st->num_specs != 0) {
 		/* Allocate speclist memory when loading a game */
 		if (st->speclist == NULL) st->speclist = calloc(st->num_specs, sizeof(*st->speclist));
 		for (i = 0; i < st->num_specs; i++) SlObject(&st->speclist[i], _station_speclist_desc);
+	}
+}
 static void Save_STNS(void)
+{
 	Station *st;
 	// Write the stations

0 comments (0 inline, 0 general)