diff -r 9a27928bcd5e -r ebf0ece7d8f6 src/train.h
--- a/src/train.h	Thu Nov 22 23:01:41 2007 +0000
+++ b/src/train.h	Fri Nov 23 16:59:30 2007 +0000
@@ -32,7 +32,7 @@
 static inline bool IsFrontEngine(const Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	return HASBIT(v->subtype, Train_Front);
+	return HasBit(v->subtype, Train_Front);
 }
 
 /** Set front engine state
@@ -41,7 +41,7 @@
 static inline void SetFrontEngine(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	SETBIT(v->subtype, Train_Front);
+	SetBit(v->subtype, Train_Front);
 }
 
 /** Remove the front engine state
@@ -50,7 +50,7 @@
 static inline void ClearFrontEngine(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	CLRBIT(v->subtype, Train_Front);
+	ClrBit(v->subtype, Train_Front);
 }
 
 /** Check if a vehicle is an articulated part of an engine
@@ -60,7 +60,7 @@
 static inline bool IsArticulatedPart(const Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	return HASBIT(v->subtype, Train_Articulated_Part);
+	return HasBit(v->subtype, Train_Articulated_Part);
 }
 
 /** Set a vehicle to be an articulated part
@@ -69,7 +69,7 @@
 static inline void SetArticulatedPart(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	SETBIT(v->subtype, Train_Articulated_Part);
+	SetBit(v->subtype, Train_Articulated_Part);
 }
 
 /** Clear a vehicle from being an articulated part
@@ -78,7 +78,7 @@
 static inline void ClearArticulatedPart(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	CLRBIT(v->subtype, Train_Articulated_Part);
+	ClrBit(v->subtype, Train_Articulated_Part);
 }
 
 /** Check if a vehicle is a wagon
@@ -88,7 +88,7 @@
 static inline bool IsTrainWagon(const Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	return HASBIT(v->subtype, Train_Wagon);
+	return HasBit(v->subtype, Train_Wagon);
 }
 
 /** Set a vehicle to be a wagon
@@ -97,7 +97,7 @@
 static inline void SetTrainWagon(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	SETBIT(v->subtype, Train_Wagon);
+	SetBit(v->subtype, Train_Wagon);
 }
 
 /** Clear wagon property
@@ -106,7 +106,7 @@
 static inline void ClearTrainWagon(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	CLRBIT(v->subtype, Train_Wagon);
+	ClrBit(v->subtype, Train_Wagon);
 }
 
 /** Check if a vehicle is an engine (can be first in a train)
@@ -116,7 +116,7 @@
 static inline bool IsTrainEngine(const Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	return HASBIT(v->subtype, Train_Engine);
+	return HasBit(v->subtype, Train_Engine);
 }
 
 /** Set engine status
@@ -125,7 +125,7 @@
 static inline void SetTrainEngine(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	SETBIT(v->subtype, Train_Engine);
+	SetBit(v->subtype, Train_Engine);
 }
 
 /** Clear engine status
@@ -134,7 +134,7 @@
 static inline void ClearTrainEngine(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	CLRBIT(v->subtype, Train_Engine);
+	ClrBit(v->subtype, Train_Engine);
 }
 
 /** Check if a vehicle is a free wagon (got no engine in front of it)
@@ -144,7 +144,7 @@
 static inline bool IsFreeWagon(const Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	return HASBIT(v->subtype, Train_Free_Wagon);
+	return HasBit(v->subtype, Train_Free_Wagon);
 }
 
 /** Set if a vehicle is a free wagon
@@ -153,7 +153,7 @@
 static inline void SetFreeWagon(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	SETBIT(v->subtype, Train_Free_Wagon);
+	SetBit(v->subtype, Train_Free_Wagon);
 }
 
 /** Clear a vehicle from being a free wagon
@@ -162,7 +162,7 @@
 static inline void ClearFreeWagon(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	CLRBIT(v->subtype, Train_Free_Wagon);
+	ClrBit(v->subtype, Train_Free_Wagon);
 }
 
 /** Check if a vehicle is a multiheaded engine
@@ -172,7 +172,7 @@
 static inline bool IsMultiheaded(const Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	return HASBIT(v->subtype, Train_Multiheaded);
+	return HasBit(v->subtype, Train_Multiheaded);
 }
 
 /** Set if a vehicle is a multiheaded engine
@@ -181,7 +181,7 @@
 static inline void SetMultiheaded(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	SETBIT(v->subtype, Train_Multiheaded);
+	SetBit(v->subtype, Train_Multiheaded);
 }
 
 /** Clear multiheaded engine property
@@ -190,7 +190,7 @@
 static inline void ClearMultiheaded(Vehicle *v)
 {
 	assert(v->type == VEH_TRAIN);
-	CLRBIT(v->subtype, Train_Multiheaded);
+	ClrBit(v->subtype, Train_Multiheaded);
 }
 
 /** Check if an engine has an articulated part.