equal
deleted
inserted
replaced
12 enum VehicleType { |
12 enum VehicleType { |
13 VEH_TRAIN, |
13 VEH_TRAIN, |
14 VEH_ROAD, |
14 VEH_ROAD, |
15 VEH_SHIP, |
15 VEH_SHIP, |
16 VEH_AIRCRAFT, |
16 VEH_AIRCRAFT, |
17 VEH_SPECIAL, |
17 VEH_EFFECT, |
18 VEH_DISASTER, |
18 VEH_DISASTER, |
19 VEH_END, |
19 VEH_END, |
20 VEH_INVALID = 0xFF, |
20 VEH_INVALID = 0xFF, |
21 }; |
21 }; |
22 DECLARE_POSTFIX_INCREMENT(VehicleType); |
22 DECLARE_POSTFIX_INCREMENT(VehicleType); |
36 inline bool IsValid() const { return this->type != VEH_INVALID; } |
36 inline bool IsValid() const { return this->type != VEH_INVALID; } |
37 }; |
37 }; |
38 |
38 |
39 static const VehicleID INVALID_VEHICLE = 0xFFFF; |
39 static const VehicleID INVALID_VEHICLE = 0xFFFF; |
40 |
40 |
41 /* Effect vehicle types */ |
|
42 enum EffectVehicle { |
|
43 EV_CHIMNEY_SMOKE = 0, |
|
44 EV_STEAM_SMOKE = 1, |
|
45 EV_DIESEL_SMOKE = 2, |
|
46 EV_ELECTRIC_SPARK = 3, |
|
47 EV_SMOKE = 4, |
|
48 EV_EXPLOSION_LARGE = 5, |
|
49 EV_BREAKDOWN_SMOKE = 6, |
|
50 EV_EXPLOSION_SMALL = 7, |
|
51 EV_BULLDOZER = 8, |
|
52 EV_BUBBLE = 9 |
|
53 }; |
|
54 |
|
55 /** Pathfinding option states */ |
41 /** Pathfinding option states */ |
56 enum { |
42 enum { |
57 VPF_OPF = 0, ///< The Original PathFinder |
43 VPF_OPF = 0, ///< The Original PathFinder |
58 VPF_NTP = 0, ///< New Train Pathfinder, replacing OPF for trains |
44 VPF_NTP = 0, ///< New Train Pathfinder, replacing OPF for trains |
59 VPF_NPF = 1, ///< New PathFinder |
45 VPF_NPF = 1, ///< New PathFinder |