Changeset - r14812:1e2727e918ca
[Not reviewed]
master
0 1 0
alberth - 14 years ago 2010-03-14 12:04:10
alberth@openttd.org
(svn r19413) -Codechange: Merging RailtypeFlag enum (a bit number) with RailTypeFlags enum (had values only).
1 file changed with 5 insertions and 6 deletions:
0 comments (0 inline, 0 general)
src/rail.h
Show inline comments
 
@@ -11,31 +11,30 @@
 

	
 
#ifndef RAIL_H
 
#define RAIL_H
 

	
 
#include "rail_type.h"
 
#include "track_type.h"
 
#include "gfx_type.h"
 
#include "core/bitmath_func.hpp"
 
#include "economy_func.h"
 
#include "slope_type.h"
 
#include "strings_type.h"
 

	
 
enum RailTypeFlag {
 
	RTF_CATENARY = 0,  ///< Set if the rail type should have catenary drawn
 
};
 
/** Railtype flags. */
 
enum RailTypeFlags {
 
	RTF_CATENARY = 0,                  ///< Bit number for drawing a catenary.
 

	
 
enum RailTypeFlags {
 
	RTFB_NONE     = 0,
 
	RTFB_CATENARY = 1 << RTF_CATENARY,
 
	RTFB_NONE     = 0,                 ///< All flags cleared.
 
	RTFB_CATENARY = 1 << RTF_CATENARY, ///< Value for drawing a catenary.
 
};
 
DECLARE_ENUM_AS_BIT_SET(RailTypeFlags);
 

	
 
struct SpriteGroup;
 

	
 
enum RailTypeSpriteGroup {
 
	RTSG_CURSORS,     ///< Cursor and toolbar icon images
 
	RTSG_OVERLAY,     ///< Images for overlaying track
 
	RTSG_GROUND,      ///< Main group of ground images
 
	RTSG_TUNNEL,      ///< Main group of ground images for snow or desert
 
	RTSG_WIRES,       ///< Catenary wires
 
	RTSG_PYLONS,      ///< Catenary pylons
0 comments (0 inline, 0 general)