X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrain.h;h=e16f726c5bebf78bbb56b091c82f11739cca1108;hb=e6b49ce4c5833ab90733aee8e42413f7c75d9da7;hp=e5bc5d260c24dfab073a7e150ebc249c53127d69;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index e5bc5d2..e16f726 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
 #include "blockiter.h"
@@ -21,7 +22,7 @@ class Zone;
 class Train: public sigc::trackable
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<Train>
+	class Loader: public Msp::DataFile::ObjectLoader<Train>
 	{
 	private:
 		Block *prev_block;
@@ -141,7 +142,7 @@ public:
 	bool is_placed() const { return !blocks.empty(); }
 	bool free_block(Block &);
 	void free_noncritical_blocks();
-	int get_entry_to_block(Block &) const;
+	int get_entry_to_block(const Block &) const;
 	float get_reserved_distance() const;
 
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);