--- a/src/aircraft_cmd.cpp	Mon Mar 19 11:41:21 2007 +0000
+++ b/src/aircraft_cmd.cpp	Mon Mar 19 12:40:51 2007 +0000
@@ -1369,7 +1369,7 @@
 	InvalidateWindow(WC_VEHICLE_VIEW, v->index);
 
 	uint amt = 2;
-	if (v->cargo_type == CT_PASSENGERS) amt += v->cargo_count;
+	if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) amt += v->cargo_count;
 	SetDParam(0, amt);
 
 	v->cargo_count = 0;

--- a/src/train_cmd.cpp	Mon Mar 19 11:41:21 2007 +0000
+++ b/src/train_cmd.cpp	Mon Mar 19 12:40:51 2007 +0000
@@ -2815,7 +2815,7 @@
 {
 	uint num = 0;
 	BEGIN_ENUM_WAGONS(v)
-		if (v->cargo_type == CT_PASSENGERS) num += v->cargo_count;
+		if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) num += v->cargo_count;
 	END_ENUM_WAGONS(v)
 	return num;
 }

--- a/src/water_cmd.cpp	Mon Mar 19 11:41:21 2007 +0000
+++ b/src/water_cmd.cpp	Mon Mar 19 12:40:51 2007 +0000
@@ -614,8 +614,7 @@
 
 		if (v->type == VEH_ROAD) { // flood bus/truck
 			pass = 1; // driver
-			if (v->cargo_type == CT_PASSENGERS)
-				pass += v->cargo_count;
+			if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) pass += v->cargo_count;
 
 			v->vehstatus |= VS_CRASHED;
 			v->u.road.crashed_ctr = 2000; // max 2220, disappear pretty fast
@@ -629,7 +628,7 @@
 
 			// crash all wagons, and count passangers
 			BEGIN_ENUM_WAGONS(v)
-				if (v->cargo_type == CT_PASSENGERS) pass += v->cargo_count;
+				if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) pass += v->cargo_count;
 				v->vehstatus |= VS_CRASHED;
 				MarkAllViewportsDirty(v->left_coord, v->top_coord, v->right_coord + 1, v->bottom_coord + 1);
 			END_ENUM_WAGONS(v)