--- a/src/station.cpp	Mon Mar 19 09:33:17 2007 +0000
+++ b/src/station.cpp	Mon Mar 19 12:38:16 2007 +0000
@@ -48,7 +48,7 @@
 	delete_ctr = 0;
 	facilities = 0;
 
-	last_vehicle_type = VEH_Invalid;
+	last_vehicle_type = VEH_INVALID;
 
 	random_bits = 0; // Random() must be called when station is really built (DC_EXEC)
 	waiting_triggers = 0;
@@ -155,7 +155,7 @@
 	return IsTileType(tile, MP_STATION) && GetStationIndex(tile) == index && IsRailwayStation(tile);
 }
 
-/*static*/ Station *Station::AllocateRaw(void)
+/*static*/ Station *Station::AllocateRaw()
 {
 	Station *st = NULL;
 
@@ -455,7 +455,7 @@
 		Vehicle *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);
 		}
 	}
 	assert(num_vehicles == 0);
@@ -467,7 +467,7 @@
 
 
 /** Low-level function for allocating a RoadStop on the pool */
-RoadStop *RoadStop::AllocateRaw( void )
+RoadStop *RoadStop::AllocateRaw()
 {
 	RoadStop *rs;