From 79627b4f8952da6a6d6132d9428ce037aeaae9df Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 5 Nov 2009 19:46:17 +0000 Subject: (svn r17976) -Codechange: Move CargoClass to cargotype.h and clean up including of newgrf_cargo.h --- src/newgrf_cargo.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/newgrf_cargo.h') diff --git a/src/newgrf_cargo.h b/src/newgrf_cargo.h index 85b3cd15f..ddebeeb30 100644 --- a/src/newgrf_cargo.h +++ b/src/newgrf_cargo.h @@ -16,21 +16,6 @@ #include "cargo_type.h" #include "gfx_type.h" -enum CargoClass { - CC_NOAVAILABLE = 0, ///< No cargo class has been specified - CC_PASSENGERS = 1 << 0, ///< Passengers - CC_MAIL = 1 << 1, ///< Mail - CC_EXPRESS = 1 << 2, ///< Express cargo (Goods, Food, Candy, but also possible for passengers) - CC_ARMOURED = 1 << 3, ///< Armoured cargo (Valuables, Gold, Diamonds) - CC_BULK = 1 << 4, ///< Bulk cargo (Coal, Grain etc., Ores, Fruit) - CC_PIECE_GOODS = 1 << 5, ///< Piece goods (Livestock, Wood, Steel, Paper) - CC_LIQUID = 1 << 6, ///< Liquids (Oil, Water, Rubber) - CC_REFRIGERATED = 1 << 7, ///< Refrigerated cargo (Food, Fruit) - CC_HAZARDOUS = 1 << 8, ///< Hazardous cargo (Nuclear Fuel, Explosives, etc.) - CC_COVERED = 1 << 9, ///< Covered/Sheltered Freight (Transporation in Box Vans, Silo Wagons, etc.) - CC_SPECIAL = 1 << 15 ///< Special bit used for livery refit tricks instead of normal cargoes. -}; - static const CargoID CT_DEFAULT = NUM_CARGO + 0; static const CargoID CT_PURCHASE = NUM_CARGO + 1; static const CargoID CT_DEFAULT_NA = NUM_CARGO + 2; -- cgit v1.2.3-54-g00ecf