X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=b388bb2be9bc1a1062f49ce6d41f7b3e8ee86382;hb=19274ec3b805af126e562c805e0c14baa14c5833;hp=6bd94fccf81dc3faed4fa816a0e5ada19789efdc;hpb=0aa9976c7ee8752a47decd8e162161b0b824af57;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 6bd94fc..b388bb2 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -237,8 +237,10 @@ void TrainRouter::train_advanced(Block &block)
 		if(route.has_track(*b_iter.endpoint().track))
 		{
 			routes.pop_front();
+			const Route *r = get_route();
 			// XXX Exceptions?
-			signal_event.emit(Message("route-changed", get_route()));
+			signal_route_changed.emit(r);
+			signal_event.emit(Message("route-changed", r));
 		}
 	}
 
@@ -253,6 +255,8 @@ void TrainRouter::train_advanced(Block &block)
 				if(!wp.has_track(*t_iter))
 				{
 					waypoints.erase(waypoints.begin());
+					signal_waypoint_reached.emit(&wp);
+					signal_event.emit(Message("waypoint-reached", &wp));
 					break;
 				}
 				else if(!block.has_track(*t_iter))