X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcentralstation.h;h=4539e0b10d00f56db768b9c416b5d138e87ab546;hb=e75f12451201fb6540ad2155e8796c2b5aee8d4c;hp=ce5253b1abe97f44a16e582ee3b133b20d33b589;hpb=e61a3ee0847b957152d98ba5945e42325821c357;p=r2c2.git

diff --git a/source/libr2c2/centralstation.h b/source/libr2c2/centralstation.h
index ce5253b..4539e0b 100644
--- a/source/libr2c2/centralstation.h
+++ b/source/libr2c2/centralstation.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_CENTRALSTATION_H_
 #define LIBR2C2_CENTRALSTATION_H_
 
@@ -30,7 +23,7 @@ private:
 
 	struct Message
 	{
-		typedef std::map<std::string, std::string> AttribMap;
+		typedef std::multimap<std::string, std::string> AttribMap;
 		typedef std::map<unsigned, AttribMap> ObjectMap;
 	
 		Tag header;
@@ -68,6 +61,7 @@ private:
 		unsigned address;
 		unsigned speed;
 		bool reverse;
+		unsigned func_mask;
 		unsigned funcs;
 		bool control;
 
@@ -78,10 +72,12 @@ private:
 	{
 		enum Symbol
 		{
-			LEFT,
-			RIGHT,
-			THREEWAY,
-			DOUBLESLIP
+			LEFT = 0,
+			RIGHT = 1,
+			THREEWAY = 2,
+			DOUBLESLIP = 3,
+			CURVED_LEFT = 21,
+			CURVED_RIGHT = 22
 		};
 
 		unsigned address;
@@ -96,7 +92,6 @@ private:
 	struct Sensor
 	{
 		bool state;
-		Msp::Time::TimeStamp off_timeout;
 
 		Sensor();
 	};