dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21921) -Codechange: Move GroundVehicleSubtypeFlags as they will be needed by some Vehicle functions.

Browse Source
This commit is contained in:
terkhen
2011-01-29 17:21:39 +00:00
parent 637c79744d
commit 14e0343d21
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ground_vehicle.hpp
View File

@@ -242,19 +242,6 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
return old_z; return old_z;
} }
/**
* Enum to handle ground vehicle subtypes.
* Do not access it directly unless you have to. Use the subtype access functions.
*/
enum GroundVehicleSubtypeFlags {
GVSF_FRONT = 0, ///< Leading engine of a consist.
GVSF_ARTICULATED_PART = 1, ///< Articulated part of an engine.
GVSF_WAGON = 2, ///< Wagon (not used for road vehicles).
GVSF_ENGINE = 3, ///< Engine that can be front engine, but might be placed behind another engine (not used for road vehicles).
GVSF_FREE_WAGON = 4, ///< First in a wagon chain (in depot) (not used for road vehicles).
GVSF_MULTIHEADED = 5, ///< Engine is multiheaded (not used for road vehicles).
};
/** /**
* Set front engine state. * Set front engine state.
*/ */

14
src/vehicle_base.h
View File

@@ -84,6 +84,20 @@ enum VisualEffect {
VE_DEFAULT = 0xFF, ///< Default value to indicate that visual effect should be based on engine class VE_DEFAULT = 0xFF, ///< Default value to indicate that visual effect should be based on engine class
}; };
/**
* Enum to handle ground vehicle subtypes.
* This is defined here instead of at #GroundVehicle because some common function require access to these flags.
* Do not access it directly unless you have to. Use the subtype access functions.
*/
enum GroundVehicleSubtypeFlags {
GVSF_FRONT = 0, ///< Leading engine of a consist.
GVSF_ARTICULATED_PART = 1, ///< Articulated part of an engine.
GVSF_WAGON = 2, ///< Wagon (not used for road vehicles).
GVSF_ENGINE = 3, ///< Engine that can be front engine, but might be placed behind another engine (not used for road vehicles).
GVSF_FREE_WAGON = 4, ///< First in a wagon chain (in depot) (not used for road vehicles).
GVSF_MULTIHEADED = 5, ///< Engine is multiheaded (not used for road vehicles).
};
/** Cached often queried values common to all vehicles. */ /** Cached often queried values common to all vehicles. */
struct VehicleCache { struct VehicleCache {
uint16 cached_max_speed; ///< Maximum speed of the consist (minimum of the max speed of all vehicles in the consist). uint16 cached_max_speed; ///< Maximum speed of the consist (minimum of the max speed of all vehicles in the consist).