X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fdummy.h;h=547efc3269622850b764feeadea4adb73f08df17;hb=b3cc0d29a0fda2d48443d66881214c81a04b1729;hp=933fce61705a6355fc6a2fb2e1f7f25bf482886d;hpb=ce2ff9a6e154f5b245cfb35114566489ab3e597c;p=r2c2.git

diff --git a/source/libr2c2/dummy.h b/source/libr2c2/dummy.h
index 933fce6..547efc3 100644
--- a/source/libr2c2/dummy.h
+++ b/source/libr2c2/dummy.h
@@ -25,38 +25,41 @@ private:
 	};
 
 	bool power;
+	bool halted;
 	std::map<unsigned, TurnoutState> turnouts;
 	std::map<unsigned, LocoState> locos;
 	std::map<unsigned, bool> sensors;
 	Msp::Time::TimeDelta turnout_delay;
+	int turnout_fail_rate;
 
 public:
-	Dummy(const std::string &);
+	Dummy(const Options &);
 
 	virtual void set_power(bool);
 	virtual bool get_power() const { return power; }
-	virtual void halt(bool) { }
-	virtual bool is_halted() const { return false; }
+	virtual void halt(bool);
+	virtual bool is_halted() const { return halted; }
 
 	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 &, const VehicleType &) { }
+	virtual DetectedLocomotive *enumerate_detected_locos(unsigned) const { return 0; }
+	virtual unsigned add_loco(unsigned a, const std::string &, const VehicleType &) { return a; }
 	virtual void remove_loco(unsigned) { }
 	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, const TrackType &);
+	virtual unsigned add_turnout(unsigned, const TrackType &);
 	virtual void remove_turnout(unsigned) { }
 	virtual void set_turnout(unsigned, unsigned);
 	virtual unsigned get_turnout(unsigned) const;
 
-	virtual void add_signal(unsigned, const SignalType &) { }
+	virtual unsigned add_signal(unsigned a, const SignalType &) { return a; }
 	virtual void remove_signal(unsigned) { }
 	virtual void set_signal(unsigned, unsigned) { }
 	virtual unsigned get_signal(unsigned) const { return 0; }
 
-	virtual void add_sensor(unsigned) { }
+	virtual unsigned add_sensor(unsigned a) { return a; }
 	virtual void remove_sensor(unsigned) { }
 	virtual void set_sensor(unsigned, bool);
 	virtual bool get_sensor(unsigned) const;