X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=5f1b46bd950f625fb04581565d7bc849c4a224ad;hb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;hp=415d49146d290e1865c65043800d7ff4e33d21d6;hpb=2d44923e135a119fde31a7a50e5fcd3e400e4f41;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 415d491..5f1b46b 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <algorithm>
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/core/maputils.h>
+#include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "aicontrol.h"
@@ -1329,7 +1323,7 @@ void Train::Loader::block(unsigned id)
 	{
 		blk = &obj.layout.get_block(id);
 	}
-	catch(const KeyError &)
+	catch(const key_error &)
 	{
 		blocks_valid = false;
 		return;
@@ -1356,7 +1350,7 @@ void Train::Loader::block_hint(unsigned id)
 	{
 		prev_block = &obj.layout.get_block(id);
 	}
-	catch(const KeyError &)
+	catch(const key_error &)
 	{
 		blocks_valid = false;
 	}