X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainstatus.cpp;h=e786f8cbfdfdce79a37982fdd17993844d8340b5;hb=d84f187ca34a6ab2f8c37d85fa13d5c113714344;hp=65c17f75418dec7c42296bb05b7686ed7cbf9f01;hpb=9f4f169affcedcf249e935f93e0a15ed60232f6a;p=r2c2.git diff --git a/source/libr2c2/trainstatus.cpp b/source/libr2c2/trainstatus.cpp index 65c17f7..e786f8c 100644 --- a/source/libr2c2/trainstatus.cpp +++ b/source/libr2c2/trainstatus.cpp @@ -25,7 +25,7 @@ void TrainStatus::check() { float scale = train.get_layout().get_catalogue().get_scale(); int s = static_cast(train.get_quantized_speed()*3.6/scale+0.5); - if(s==0 && train.is_active()) + if(s==0 && train.get_block_allocator().is_active()) s = -1; if(s!=speed) @@ -38,7 +38,7 @@ void TrainStatus::check() } else if(s==-1) status = "Waiting"; - else if(!train.get_vehicle(0).get_track()) + else if(!train.get_vehicle(0).is_placed()) status = "Unplaced"; else status = "Stopped";