cpp/openttd-patchpack/source Changeset - r8860:3fd806ac9c65

Changeset - r8860:3fd806ac9c65

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

peter1138 - 16 years ago 2008-04-08 07:19:29
peter1138@openttd.org

(svn r12624) -Codechange: Make drawing of catenary an attribute of rail types, instead of deciding by the rail type directly.

2 files changed with 28 insertions and 1 deletions:

src/rail.h

src/table/railtypes.h

0 comments (0 inline, 0 general)

src/rail.h

➞

Show inline comments

@@ @@ -13,6 +13,16 @@ @@
 #include "economy_func.h"
 #include "tile_cmd.h"
 enum RailTypeFlag {
 	RTF_CATENARY = 0,  ///< Set if the rail type should have catenary drawn
 };
 enum RailTypeFlags {
 	RTFB_NONE     = 0,
 	RTFB_CATENARY = 1 << RTF_CATENARY,
 };
 DECLARE_ENUM_AS_BIT_SET(RailTypeFlags);
 /** This struct contains all the info that is needed to draw and construct tracks.
  */
 struct RailtypeInfo {
@@ @@ -93,6 +103,11 @@ struct RailtypeInfo { @@
 	 * Multiplier for curve maximum speed advantage
 	 */
 	byte curve_speed;
 	/**
 	 * Bit mask of rail type flags
 	 */
 	RailTypeFlags flags;
 };
@@ @@ -190,7 +205,7 @@ int TicksToLeaveDepot(const Vehicle *v); @@
  */
 static inline bool HasCatenary(RailType rt)
+{
-	return rt == RAILTYPE_ELECTRIC;
+	return HasBit(GetRailTypeInfo(rt)->flags, RTF_CATENARY);
+}

src/table/railtypes.h

➞

Show inline comments

@@ @@ -60,6 +60,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* curve speed advantage (multiplier) */
 ,
 		/* flags */
 		RTFB_NONE,
 	},
 	/** Electrified railway */
@@ @@ -116,6 +119,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* curve speed advantage (multiplier) */
 ,
 		/* flags */
 		RTFB_CATENARY,
 	},
 	/** Monorail */
@@ @@ -168,6 +174,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* curve speed advantage (multiplier) */
 ,
 		/* flags */
 		RTFB_NONE,
 	},
 	/** Maglev */
@@ @@ -220,6 +229,9 @@ RailtypeInfo _railtypes[] = { @@
 		/* curve speed advantage (multiplier) */
 ,
 		/* flags */
 		RTFB_NONE,
 	},
 };

0 comments (0 inline, 0 general)