From 587b2a8826274242e400124eb5bb8704a046ff81 Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 26 Aug 2006 18:27:15 +0000 Subject: [PATCH] (svn r6150) -Codechange: introduced and used RoadStopID where needed --- openttd.h | 1 + station.h | 2 +- station_cmd.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openttd.h b/openttd.h index 9d6b1b44ac..9ed4db102d 100644 --- a/openttd.h +++ b/openttd.h @@ -37,6 +37,7 @@ typedef struct Industry Industry; typedef struct DrawPixelInfo DrawPixelInfo; typedef uint16 VehicleID; typedef uint16 StationID; +typedef uint16 RoadStopID; typedef uint16 TownID; typedef uint16 IndustryID; typedef uint16 DepotID; diff --git a/station.h b/station.h index 6d753183dc..36b7334e50 100644 --- a/station.h +++ b/station.h @@ -35,7 +35,7 @@ typedef struct RoadStop { TileIndex xy; bool used; byte status; - uint32 index; + RoadStopID index; byte num_vehicles; StationID station; struct RoadStop *next; diff --git a/station_cmd.c b/station_cmd.c index 135081c6dd..469d6ce813 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -153,7 +153,7 @@ RoadStop *AllocateRoadStop(void) * 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;