--- a/newgrf.c	Thu Nov 10 17:21:05 2005 +0000
+++ b/newgrf.c	Fri Nov 11 20:34:16 2005 +0000
@@ -869,13 +869,13 @@
 			FOR_EACH_OBJECT {
 				StationSpec *stat = &_cur_grffile->stations[stid + i];
 				byte srcid = grf_load_byte(&buf);
-				StationSpec *srcstat = &_cur_grffile->stations[srcid];
+				const StationSpec *srcstat = &_cur_grffile->stations[srcid];
 				int t;
 
 				stat->tiles = srcstat->tiles;
 				for (t = 0; t < stat->tiles; t++) {
 					DrawTileSprites *dts = &stat->renderdata[t];
-					DrawTileSprites *sdts = &srcstat->renderdata[t];
+					const DrawTileSprites *sdts = &srcstat->renderdata[t];
 					DrawTileSeqStruct const *sdtss = sdts->seq;
 					int seq_count = 0;
 

--- a/rail_cmd.c	Thu Nov 10 17:21:05 2005 +0000
+++ b/rail_cmd.c	Fri Nov 11 20:34:16 2005 +0000
@@ -1518,12 +1518,12 @@
 
 		if (IsRailWaypoint(m5) && HASBIT(_m[ti->tile].m3, 4)) {
 			// look for customization
-			StationSpec *stat = GetCustomStation(STAT_CLASS_WAYP, _m[ti->tile].m4);
+			const StationSpec *stat = GetCustomStation(STAT_CLASS_WAYP, _m[ti->tile].m4);
 
-			if (stat) {
+			if (stat != NULL) {
 				DrawTileSeqStruct const *seq;
 				// emulate station tile - open with building
-				DrawTileSprites *cust = &stat->renderdata[2 + (m5 & 0x1)];
+				const DrawTileSprites *cust = &stat->renderdata[2 + (m5 & 0x1)];
 				uint32 relocation = GetCustomStationRelocation(stat, ComposeWaypointStation(ti->tile), 0);
 
 				/* We don't touch the 0x8000 bit. In all this

--- a/station_cmd.c	Thu Nov 10 17:21:05 2005 +0000
+++ b/station_cmd.c	Fri Nov 11 20:34:16 2005 +0000
@@ -903,7 +903,7 @@
 }
 
 // stolen from TTDPatch
-static void GetStationLayout(byte *layout, int numtracks, int plat_len, StationSpec *spec)
+static void GetStationLayout(byte *layout, int numtracks, int plat_len, const StationSpec *spec)
 {
 	if (spec != NULL && spec->lengths >= plat_len &&
 			spec->platforms[plat_len - 1] >= numtracks &&
@@ -1033,7 +1033,7 @@
 		TileIndexDiff tile_delta;
 		byte *layout_ptr;
 		StationID station_index = st->index;
-		StationSpec *statspec;
+		const StationSpec *statspec;
 
 		// Now really clear the land below the station
 		// It should never return CMD_ERROR.. but you never know ;)
@@ -2139,7 +2139,7 @@
 
 	if (_m[ti->tile].m3 & 0x10) {
 		// look for customization
-		StationSpec *statspec = GetCustomStation(STAT_CLASS_DFLT, _m[ti->tile].m4);
+		const StationSpec *statspec = GetCustomStation(STAT_CLASS_DFLT, _m[ti->tile].m4);
 
 		//debug("Cust-o-mized %p", statspec);
 

--- a/waypoint.c	Thu Nov 10 17:21:05 2005 +0000
+++ b/waypoint.c	Fri Nov 11 20:34:16 2005 +0000
@@ -375,9 +375,9 @@
 /* Draw a waypoint */
 void DrawWaypointSprite(int x, int y, int stat_id, RailType railtype)
 {
-	StationSpec *stat;
+	const StationSpec *stat;
 	uint32 relocation;
-	DrawTileSprites *cust;
+	const DrawTileSprites *cust;
 	DrawTileSeqStruct const *seq;
 	const RailtypeInfo *rti = GetRailTypeInfo(railtype);
 	uint32 ormod, img;