X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainstatus.cpp;h=e786f8cbfdfdce79a37982fdd17993844d8340b5;hb=3ffe8b384fabeee1c3e636b83dd0006f3f5acfe1;hp=777bc768b410dfda2a50c8014a46639ba98bc5b8;hpb=34f8bf04e4bdffefeceea59b186386b51c542b9d;p=r2c2.git

diff --git a/source/libr2c2/trainstatus.cpp b/source/libr2c2/trainstatus.cpp
index 777bc76..e786f8c 100644
--- a/source/libr2c2/trainstatus.cpp
+++ b/source/libr2c2/trainstatus.cpp
@@ -1,11 +1,4 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "catalogue.h"
 #include "layout.h"
 #include "train.h"
@@ -14,8 +7,6 @@ Distributed under the GPL
 
 using namespace Msp;
 
-#include <msp/io/print.h>
-
 namespace R2C2 {
 
 TrainStatus::TrainStatus(Train &t):
@@ -25,7 +16,7 @@ TrainStatus::TrainStatus(Train &t):
 	check();
 }
 
-void TrainStatus::tick(const Time::TimeStamp &, const Time::TimeDelta &)
+void TrainStatus::tick(const Time::TimeDelta &)
 {
 	check();
 }
@@ -34,7 +25,7 @@ void TrainStatus::check()
 {
 	float scale = train.get_layout().get_catalogue().get_scale();
 	int s = static_cast<int>(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)
@@ -47,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";