From 4c4b035175a6b8c23793bc3250c75bf50c4d72bd Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sat, 24 Feb 2007 23:36:40 +0000 Subject: (svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible. --- src/newgrf_cargo.h | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) (limited to 'src/newgrf_cargo.h') diff --git a/src/newgrf_cargo.h b/src/newgrf_cargo.h index 099a35b1a..67acf35bd 100644 --- a/src/newgrf_cargo.h +++ b/src/newgrf_cargo.h @@ -15,41 +15,8 @@ enum { CC_REFRIGERATED = 1 << 7, }; -enum GlobalCargo { - GC_PASSENGERS = 0, - GC_COAL = 1, - GC_MAIL = 2, - GC_OIL = 3, - GC_LIVESTOCK = 4, - GC_GOODS = 5, - GC_GRAIN = 6, // GC_WHEAT / GC_MAIZE - GC_WOOD = 7, - GC_IRON_ORE = 8, - GC_STEEL = 9, - GC_VALUABLES = 10, // GC_GOLD / GC_DIAMONDS - GC_PAPER = 11, - GC_FOOD = 12, - GC_FRUIT = 13, - GC_COPPER_ORE = 14, - GC_WATER = 15, - GC_RUBBER = 16, - GC_SUGAR = 17, - GC_TOYS = 18, - GC_BATTERIES = 19, - GC_CANDY = 20, - GC_TOFFEE = 21, - GC_COLA = 22, - GC_COTTON_CANDY = 23, - GC_BUBBLES = 24, - GC_PLASTIC = 25, - GC_FIZZY_DRINKS = 26, - GC_PAPER_TEMP = 27, - GC_UNDEFINED = 28, // undefined; unused slot in arctic climate - GC_DEFAULT = 29, - GC_PURCHASE = 30, - GC_DEFAULT_NA = 31, // New stations only - GC_INVALID = 255, - NUM_GLOBAL_CID = 32 -}; +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; #endif /* NEWGRF_CARGO_H */ -- cgit v1.2.3-54-g00ecf