Mercurial > hg > openttd
changeset 5716:3c620ec4e6c7 draft
(svn r8207) -Fix
Remove the write-only attribute RoadStop::station
author | tron <tron@openttd.org> |
---|---|
date | Wed, 17 Jan 2007 21:14:17 +0000 |
parents | 54ea61b8c5ca |
children | 5e23e918212d |
files | src/oldloader.cpp src/station.cpp src/station.h src/station_cmd.cpp |
diffstat | 4 files changed, 11 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -314,10 +314,8 @@ } /* Check if there is a bus or truck station, and convert to new format */ - if (st->bus_tile_obsolete != 0) st->bus_stops = new RoadStop(st->bus_tile_obsolete, st->index); - - if (st->lorry_tile_obsolete != 0) st->truck_stops = new RoadStop(st->lorry_tile_obsolete, st->index); - + if (st->bus_tile_obsolete != 0) st->bus_stops = new RoadStop(st->bus_tile_obsolete); + if (st->lorry_tile_obsolete != 0) st->truck_stops = new RoadStop(st->lorry_tile_obsolete); } }
--- a/src/station.cpp +++ b/src/station.cpp @@ -348,16 +348,15 @@ } /** Initializes a RoadStop */ -RoadStop::RoadStop(TileIndex tile, StationID index) : +RoadStop::RoadStop(TileIndex tile) : xy(tile), used(true), status(3), // stop is free num_vehicles(0), - station(index), next(NULL), prev(NULL) { - DEBUG(ms, cDebugCtorLevel, "I+%3d at %d[0x%x]", index, tile, tile); + DEBUG(ms, cDebugCtorLevel, "I+ at %d[0x%x]", tile, tile); } /** De-Initializes a RoadStops. This includes clearing all slots that vehicles might @@ -379,10 +378,9 @@ if (next != NULL) next->prev = prev; used = false; - DEBUG(ms, cDebugCtorLevel , "I-%3d at %d[0x%x]", station, xy, xy); + DEBUG(ms, cDebugCtorLevel , "I- at %d[0x%x]", xy, xy); xy = INVALID_TILE; - station = INVALID_STATION; }
--- a/src/station.h +++ b/src/station.h @@ -50,13 +50,12 @@ byte status; RoadStopID index; byte num_vehicles; - StationID station; struct RoadStop *next; struct RoadStop *prev; static const int cDebugCtorLevel = 3; - RoadStop(TileIndex tile, StationID index); + RoadStop(TileIndex tile); ~RoadStop(); void *operator new (size_t size);
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1361,7 +1361,7 @@ } //give us a road stop in the list, and check if something went wrong - road_stop = new RoadStop(tile, INVALID_STATION); + road_stop = new RoadStop(tile); if (road_stop == NULL) { return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS); } @@ -1412,7 +1412,6 @@ //initialize an empty station road_stop->prev = prev; - road_stop->station = st->index; if (!st->facilities) st->xy = tile; st->facilities |= (type) ? FACIL_TRUCK_STOP : FACIL_BUS_STOP; st->owner = _current_player; @@ -2852,7 +2851,7 @@ SLE_VAR(RoadStop,status, SLE_UINT8), /* Index was saved in some versions, but this is not needed */ SLE_CONDNULL(4, 0, 8), - SLE_VAR(RoadStop,station, SLE_UINT16), + SLE_CONDNULL(2, 0, 44), SLE_CONDNULL(1, 0, 25), SLE_REF(RoadStop,next, REF_ROADSTOPS), @@ -3007,13 +3006,13 @@ * convert, if needed */ if (CheckSavegameVersion(6)) { if (st->bus_tile_obsolete != 0) { - st->bus_stops = new RoadStop(st->bus_tile_obsolete, st->index); + st->bus_stops = new RoadStop(st->bus_tile_obsolete); if (st->bus_stops == NULL) error("Station: too many busstations in savegame"); } if (st->lorry_tile_obsolete != 0) { - st->truck_stops = new RoadStop(st->lorry_tile_obsolete, st->index); + st->truck_stops = new RoadStop(st->lorry_tile_obsolete); if (st->truck_stops == NULL) error("Station: too many truckstations in savegame"); @@ -3040,7 +3039,7 @@ int index; while ((index = SlIterateArray()) != -1) { - RoadStop *rs = new (index) RoadStop(INVALID_TILE, INVALID_STATION); + RoadStop *rs = new (index) RoadStop(INVALID_TILE); SlObject(rs, _roadstop_desc); }