diff options
| author | celestar <celestar@openttd.org> | 2006-03-18 08:00:27 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2006-03-18 08:00:27 +0000 |
| commit | e54f1e1e2b5155c56a29ac32bc852507b04b9341 (patch) | |
| tree | b33548d3513e245a98d65a5debc42aebfe66c8c7 | |
| parent | 2bbcd41247d9312be1d0b685da0356ac809f2b23 (diff) | |
| download | openttd-e54f1e1e2b5155c56a29ac32bc852507b04b9341.tar.xz | |
(svn r3939) -Fix: No longer assume that the number of slots is 2. It was not a problem up to now, but it's not The Right Thing (TM) to do either
| -rw-r--r-- | console_cmds.c | 3 | ||||
| -rw-r--r-- | oldloader.c | 5 | ||||
| -rw-r--r-- | station_cmd.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/console_cmds.c b/console_cmds.c index a698df3e4..7b044b4d9 100644 --- a/console_cmds.c +++ b/console_cmds.c @@ -109,7 +109,8 @@ DEF_CONSOLE_CMD(ConResetSlots) } FOR_ALL_ROADSTOPS(rs) { - rs->slot[0] = rs->slot[1] = INVALID_VEHICLE; + int i; + for (i = 0; i < NUM_SLOTS; i++) rs->slot[i] = INVALID_VEHICLE; } return true; diff --git a/oldloader.c b/oldloader.c index b786f321c..4489e44f1 100644 --- a/oldloader.c +++ b/oldloader.c @@ -356,6 +356,7 @@ static void FixOldTowns(void) static void FixOldStations(void) { Station *st; + int i; FOR_ALL_STATIONS(st) { /* Check if we need to swap width and height for the station */ @@ -372,7 +373,7 @@ static void FixOldStations(void) st->bus_stops->station = st->index; st->bus_stops->next = NULL; st->bus_stops->prev = NULL; - st->bus_stops->slot[0] = st->bus_stops->slot[1] = INVALID_VEHICLE; + for (i = 0; i < NUM_SLOTS; i++) st->bus_stops->slot[i] = INVALID_VEHICLE; } if (st->lorry_tile_obsolete != 0) { @@ -383,7 +384,7 @@ static void FixOldStations(void) st->truck_stops->station = st->index; st->truck_stops->next = NULL; st->truck_stops->prev = NULL; - st->truck_stops->slot[0] = st->truck_stops->slot[1] = INVALID_VEHICLE; + for (i = 0; i < NUM_SLOTS; i++) st->truck_stops->slot[i] = INVALID_VEHICLE; } } } diff --git a/station_cmd.c b/station_cmd.c index 4eaeb3003..567a418ff 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -86,13 +86,15 @@ static void MarkStationDirty(const Station* st) static void InitializeRoadStop(RoadStop *road_stop, RoadStop *previous, TileIndex tile, StationID index) { + int i; road_stop->xy = tile; road_stop->used = true; road_stop->status = 3; //stop is free - road_stop->slot[0] = road_stop->slot[1] = INVALID_VEHICLE; road_stop->next = NULL; road_stop->prev = previous; road_stop->station = index; + + for (i = 0; i < NUM_SLOTS; i++) road_stop->slot[i] = INVALID_VEHICLE; } RoadStop* GetPrimaryRoadStop(const Station* st, RoadStopType type) |