(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

src/road.h

@@ -3,7 +3,10 @@
 #ifndef ROAD_H
 #define ROAD_H
 
+#include "helpers.hpp"
+
 typedef enum RoadBits {
+	ROAD_NONE = 0U,
 	ROAD_NW  = 1U,
 	ROAD_SW  = 2U,
 	ROAD_SE  = 4U,
@@ -13,6 +16,8 @@ typedef enum RoadBits {
 	ROAD_ALL = ROAD_X  | ROAD_Y
 } RoadBits;
 
+DECLARE_ENUM_AS_BIT_SET(RoadBits);
+
 static inline RoadBits ComplementRoadBits(RoadBits r)
 {
 	return (RoadBits)(ROAD_ALL ^ r);