mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8203) -Fix: 

Use initialisers, reduce variable scope, remove spurious whitespace, fix format string to make it readable
release/0.6
tron 2007-01-17 20:34:29 +00:00
parent 0eb5af76d1
commit f3daa56208
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/station.cpp
View File

@ -348,16 +348,16 @@ void RoadStop::operator delete(void *p, int index)
} }
/** Initializes a RoadStop */ /** 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); 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 /** De-Initializes a RoadStops. This includes clearing all slots that vehicles might
@ -365,10 +365,10 @@ RoadStop::RoadStop(TileIndex tile, StationID index)
*/ */
RoadStop::~RoadStop() RoadStop::~RoadStop()
{ {
Vehicle *v;
/* Clear the slot assignment of all vehicles heading for this road stop */ /* Clear the slot assignment of all vehicles heading for this road stop */
if (num_vehicles != 0) { if (num_vehicles != 0) {
Vehicle *v;
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (v->type == VEH_Road && v->u.road.slot == this) ClearSlot(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; if (next != NULL) next->prev = prev;
used = false; 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; xy = INVALID_TILE;
station = INVALID_STATION; station = INVALID_STATION;

2
src/station.h
View File

@ -66,7 +66,7 @@ typedef struct RoadStop {
void *operator new (size_t size, int index); void *operator new (size_t size, int index);
void operator delete(void *rs, int index); void operator delete(void *rs, int index);
static RoadStop *AllocateRaw( void ); static RoadStop *AllocateRaw(void);
} RoadStop; } RoadStop;
typedef struct StationSpecList { typedef struct StationSpecList {