diff options
| author | belugas <belugas@openttd.org> | 2006-05-18 02:43:23 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2006-05-18 02:43:23 +0000 |
| commit | a102163239095d257f1dcd8bdc98864e1b08f5b6 (patch) | |
| tree | f50ceeccb76f9dbc449f73b1d3f99335b55550b2 /newgrf_engine.c | |
| parent | 282b76a0b3683fda13eb8c413720aff957c74f8b (diff) | |
| download | openttd-a102163239095d257f1dcd8bdc98864e1b08f5b6.tar.xz | |
(svn r4902) Newgrf : Introduction of the newgrf_cargo files.
Clearing engine and newgrf_engine from cargo related structures.
Apart from moving stuff cargo related, there is nothing really newcargo for now.
Diffstat (limited to 'newgrf_engine.c')
| -rw-r--r-- | newgrf_engine.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/newgrf_engine.c b/newgrf_engine.c index c89dbd0a7..3a7773130 100644 --- a/newgrf_engine.c +++ b/newgrf_engine.c @@ -14,22 +14,9 @@ #include "newgrf_engine.h" #include "newgrf_station.h" #include "newgrf_spritegroup.h" +#include "newgrf_cargo.h" -/* XXX These tables should be moved / ripped out when newcargos is implemented. */ - -/* Cargo classes */ -enum { - CC_NONE = 0, - CC_PASSENGERS = 1 << 0, - CC_MAIL = 1 << 1, - CC_EXPRESS = 1 << 2, - CC_ARMOURED = 1 << 3, - CC_BULK = 1 << 4, - CC_PIECE_GOODS = 1 << 5, - CC_LIQUID = 1 << 6, - CC_REFRIGERATED = 1 << 7, -}; /* Default cargo classes */ static const uint16 _cargo_classes[NUM_GLOBAL_CID] = { @@ -61,9 +48,9 @@ static const uint16 _cargo_classes[NUM_GLOBAL_CID] = { CC_LIQUID, CC_PIECE_GOODS, CC_PIECE_GOODS, - CC_NONE, - CC_NONE, - CC_NONE, + CC_NOAVAILABLE, + CC_NOAVAILABLE, + CC_NOAVAILABLE, }; int _traininfo_vehicle_pitch = 0; |