X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=56832c837542d9447acb3022a8d655e1a8786939;hb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;hp=c127086d43d3d1ec2d647dac0ae067418e83616f;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index c127086..56832c8 100644
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -580,7 +580,7 @@ Train::Loader::Loader(Train &t):
 {
 	add("block",       &Loader::block);
 	add("block_hint",  &Loader::block_hint);
-	add("name",        &Train::name);
+	add("name",        &Loader::name);
 	add("real_speed",  &Loader::real_speed);
 	add("route",       &Loader::route);
 }
@@ -596,7 +596,7 @@ void Train::Loader::block(unsigned id)
 
 	blk.reserve(&obj);
 	obj.cur_blocks.push_back(BlockRef(&blk, entry));
-	obj.status = "Stopped";
+	obj.set_status("Stopped");
 	obj.set_position(blk.get_endpoints()[entry]);
 
 	prev_block = &blk;
@@ -607,6 +607,11 @@ void Train::Loader::block_hint(unsigned id)
 	prev_block = &obj.trfc_mgr.get_block(id);
 }
 
+void Train::Loader::name(const string &n)
+{
+	obj.set_name(n);
+}
+
 void Train::Loader::real_speed(unsigned i, float speed, float weight)
 {
 	obj.real_speed[i].speed = speed;
@@ -615,7 +620,7 @@ void Train::Loader::real_speed(unsigned i, float speed, float weight)
 
 void Train::Loader::route(const string &n)
 {
-	obj.route = &obj.trfc_mgr.get_layout().get_route(n);
+	obj.set_route(&obj.trfc_mgr.get_layout().get_route(n));
 }
 
 } // namespace Marklin