X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Faicontrol.h;h=01429cdd01581481918eefe10e1d22abd6d90c0e;hb=374dc443d044f31c925342f339a628c860c08a7e;hp=0d84218875848f69b111cb668ab25348f5150118;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/aicontrol.h b/source/libr2c2/aicontrol.h
index 0d84218..01429cd 100644
--- a/source/libr2c2/aicontrol.h
+++ b/source/libr2c2/aicontrol.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,36 +9,41 @@ Distributed under the GPL
 #define LIBR2C2_AICONTROL_H_
 
 #include <sigc++/trackable.h>
-#include "controller.h"
+#include "trainai.h"
 
 namespace R2C2 {
 
 class Train;
 
-class AIControl: public Controller, public sigc::trackable
+class AIControl: public TrainAI, public sigc::trackable
 {
 private:
-	Train &train;
-	Controller *next_ctrl;
-	Control target_speed;
-	bool blocked;
-	bool approach;
+	enum State
+	{
+		NORMAL,
+		APPROACH,
+		BLOCKED,
+		FOLLOW
+	};
+
+	float target_speed;
+	bool reverse;
+	bool pending_reverse;
+	State state;
+	bool need_update;
 
 public:
-	AIControl(Train &, Controller *);
-	virtual ~AIControl();
+	AIControl(Train &);
 
-	virtual void set_control(const std::string &, float);
-	virtual const Control &get_control(const std::string &) const;
+	void set_target_speed(float);
+	float get_target_speed() const { return target_speed; }
+	void set_reverse(bool);
+	bool get_reverse() const { return reverse; } 
 
-	virtual float get_speed() const;
-	virtual bool get_reverse() const;
-	virtual float get_braking_distance() const;
-
-	virtual void tick(const Msp::Time::TimeDelta &);
+	virtual void message(const Message &);
+	virtual void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 
 private:
-	void control_changed(const Control &);
 	void arrived();
 };