Mercurial > hg > openttd
changeset 5713:ce6d8f33f06f draft
(svn r8203) -Fix:
Use initialisers, reduce variable scope, remove spurious whitespace, fix format string to make it readable
| author | tron <tron@openttd.org> |
|---|---|
| date | Wed, 17 Jan 2007 20:34:29 +0000 |
| parents | 1cf357a68120 |
| children | 8ee5d8d77787 |
| files | src/station.cpp src/station.h |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station.cpp +++ b/src/station.cpp @@ -348,16 +348,16 @@ } /** Initializes a RoadStop */ -RoadStop::RoadStop(TileIndex tile, StationID index) +RoadStop::RoadStop(TileIndex tile, StationID index) : + 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); - xy = tile; - used = true; - status = 3; //stop is free - next = NULL; - prev = NULL; - station = index; - num_vehicles = 0; } /** De-Initializes a RoadStops. This includes clearing all slots that vehicles might @@ -365,10 +365,10 @@ */ RoadStop::~RoadStop() { - Vehicle *v; - /* Clear the slot assignment of all vehicles heading for this road stop */ if (num_vehicles != 0) { + Vehicle *v; + FOR_ALL_VEHICLES(v) { if (v->type == VEH_Road && v->u.road.slot == this) ClearSlot(v); } @@ -379,7 +379,7 @@ if (next != NULL) next->prev = prev; used = false; - DEBUG(ms, cDebugCtorLevel , "I- at %3d%d[0x%x]", station, xy, xy); + DEBUG(ms, cDebugCtorLevel , "I-%3d at %d[0x%x]", station, xy, xy); xy = INVALID_TILE; station = INVALID_STATION;