--- a/openttd.h	Sat Aug 26 18:05:05 2006 +0000
+++ b/openttd.h	Sat Aug 26 18:27:15 2006 +0000
@@ -37,6 +37,7 @@
 typedef struct DrawPixelInfo DrawPixelInfo;
 typedef uint16 VehicleID;
 typedef uint16 StationID;
+typedef uint16 RoadStopID;
 typedef uint16 TownID;
 typedef uint16 IndustryID;
 typedef uint16 DepotID;

--- a/station.h	Sat Aug 26 18:05:05 2006 +0000
+++ b/station.h	Sat Aug 26 18:27:15 2006 +0000
@@ -35,7 +35,7 @@
 	TileIndex xy;
 	bool used;
 	byte status;
-	uint32 index;
+	RoadStopID index;
 	byte num_vehicles;
 	StationID station;
 	struct RoadStop *next;

--- a/station_cmd.c	Sat Aug 26 18:05:05 2006 +0000
+++ b/station_cmd.c	Sat Aug 26 18:27:15 2006 +0000
@@ -153,7 +153,7 @@
 	 * TODO - This is just a temporary stage, this will be removed. */
 	for (rs = GetRoadStop(0); rs != NULL; rs = (rs->index + 1 < GetRoadStopPoolSize()) ? GetRoadStop(rs->index + 1) : NULL) {
 		if (!IsValidRoadStop(rs)) {
-			uint index = rs->index;
+			RoadStopID index = rs->index;
 
 			memset(rs, 0, sizeof(*rs));
 			rs->index = index;