summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2007-01-17 20:34:29 +0000
committertron <tron@openttd.org>2007-01-17 20:34:29 +0000
commit0b710695a549960050d876b1a93149586bc393de (patch)
tree59c354392813dddde5c85f27f29997d73f063688
parent2655cbc3b4d364b9e7ce80a741f8541fe78fecec (diff)
downloadopenttd-0b710695a549960050d876b1a93149586bc393de.tar.xz
(svn r8203) -Fix:
Use initialisers, reduce variable scope, remove spurious whitespace, fix format string to make it readable
-rw-r--r--src/station.cpp22
-rw-r--r--src/station.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/src/station.cpp b/src/station.cpp
index e23439eb0..2330df237 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -348,16 +348,16 @@ void RoadStop::operator delete(void *p, int index)
}
/** 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(TileIndex tile, StationID index)
*/
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 @@ RoadStop::~RoadStop()
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;
diff --git a/src/station.h b/src/station.h
index dc86f689f..d7f6246f6 100644
--- a/src/station.h
+++ b/src/station.h
@@ -66,7 +66,7 @@ typedef struct RoadStop {
void *operator new (size_t size, int index);
void operator delete(void *rs, int index);
- static RoadStop *AllocateRaw( void );
+ static RoadStop *AllocateRaw(void);
} RoadStop;
typedef struct StationSpecList {