BasicLoader is now called ObjectLoader

[r2c2.git] / source / libr2c2 / centralstation.h

diff --git a/source/libr2c2/centralstation.h b/source/libr2c2/centralstation.h
index ce5253b1abe97f44a16e582ee3b133b20d33b589..4554d147b91382242422f729f8aade4d6c8521af 100644 (file)
--- 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;
 
@@ -96,7 +90,6 @@ private:
        struct Sensor
        {
                bool state;
-               Msp::Time::TimeStamp off_timeout;
 
                Sensor();
        };