diff -r ee050ca3889f -r 5247b66aad19 src/vehicle_gui.cpp
--- a/src/vehicle_gui.cpp	Sat Feb 24 23:20:21 2007 +0000
+++ b/src/vehicle_gui.cpp	Sat Feb 24 23:36:40 2007 +0000
@@ -210,10 +210,8 @@
 
 		/* Loop through all cargos in the refit mask */
 		for (CargoID cid = 0; cid != NUM_CARGO && num_lines < max_lines; cid++) {
-			const CargoSpec *cs = GetCargo(cid);
-
 			/* Skip cargo type if it's not listed */
-			if (!HASBIT(cmask, cs->bitnum)) continue;
+			if (!HASBIT(cmask, cid)) continue;
 
 			/* Check the vehicle's callback mask for cargo suffixes */
 			if (HASBIT(callbackmask, CBM_CARGO_SUFFIX)) {
@@ -516,9 +514,7 @@
 
 		/* Add each cargo type to the list */
 		for (CargoID cid = 0; cid < NUM_CARGO; cid++) {
-			const CargoSpec *cs = GetCargo(cid);
-
-			if (!HASBIT(cmask, cs->bitnum)) continue;
+			if (!HASBIT(cmask, cid)) continue;
 
 			if (!first) b = strecpy(b, ", ", lastof(_userstring));
 			first = false;