Update #includes that have been renamed, and remove stray ones

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

diff --git a/source/libr2c2/dummy.h b/source/libr2c2/dummy.h
index 5357bbd7bad9726bb1d11f89562a65074d531c3a..1ec39b72db549e6d595bb0f88df6f7d9b6d0ce30 100644 (file)
--- a/source/libr2c2/dummy.h
+++ b/source/libr2c2/dummy.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_DUMMY_H_
 #define LIBR2C2_DUMMY_H_
 
@@ -23,7 +16,7 @@ private:
        };
 
        bool power;
-       std::map<unsigned, bool> turnouts;
+       std::map<unsigned, unsigned> turnouts;
        std::map<unsigned, LocoState> locos;
        std::map<unsigned, bool> sensors;
 
@@ -37,14 +30,14 @@ public:
 
        virtual const char *enumerate_protocols(unsigned) const;
        virtual unsigned get_protocol_speed_steps(const std::string &) const;
-       virtual void add_loco(unsigned, const std::string &) { }
+       virtual void add_loco(unsigned, const std::string &, const VehicleType &) { }
        virtual void set_loco_speed(unsigned, unsigned);
        virtual void set_loco_reverse(unsigned, bool);
        virtual void set_loco_function(unsigned, unsigned, bool);
 
-       virtual void add_turnout(unsigned);
-       virtual void set_turnout(unsigned, bool);
-       virtual bool get_turnout(unsigned) const;
+       virtual void add_turnout(unsigned, const TrackType &);
+       virtual void set_turnout(unsigned, unsigned);
+       virtual unsigned get_turnout(unsigned) const;
 
        virtual void add_sensor(unsigned) { }
        virtual void set_sensor(unsigned, bool);