X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=308e5b2d4db0e80437a790ac7cbd1bf8ae38075c;hb=212bc6eb3ab2dbad39725984ac715c64f8de29ff;hp=777758700a4a857bf81df07c42d4a8cb7975ae50;hpb=a448b6ac73e0eb19980e69b095136eabe95d2534;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 7777587..308e5b2 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -176,6 +176,10 @@ int Engineer::main()
 		y -= tpanel->get_geometry().h;
 	}
 
+	const list<Block *> &blocks = trfc_mgr->get_blocks();
+	for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		reset_block_color(**i);
+
 	wnd->show();
 
 	Application::main();
@@ -265,6 +269,9 @@ void Engineer::tick()
 	const list<Train *> &trains = trfc_mgr->get_trains();
 	for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
+		if(!(*i)->is_placed())
+			continue;
+
 		GL::PushMatrix _push;
 
 		const Point &tp = (*i)->get_position();
@@ -307,7 +314,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 		{
 			set_block_color(*placing_block, GL::Color(1, 1, 1));
 
-			placing_train->place(placing_block, placing_entry);
+			placing_train->place(*placing_block, placing_entry);
 			placing_train = 0;
 			main_panel->set_status_text(string());
 		}