X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=e1268c63f25323f55a9b002589989a419a3c573a;hb=66c2c7ca5a4bd369293959bc211b040834343381;hp=e5381bd090a2f3bbf0e7e1179f4821637401727e;hpb=143b27eca71cb6d3659c177fa4946e8c3545aec4;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index e5381bd..e1268c6 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -181,6 +181,10 @@ void Engineer::tick()
 {
 	window.get_display().tick();
 
+	for(list<Train *>::iterator i=new_trains.begin(); i!=new_trains.end(); ++i)
+		process_new_train(**i);
+	new_trains.clear();
+
 	layout.tick();
 	event_disp.tick(Time::zero);
 
@@ -392,7 +396,7 @@ Track *Engineer::pick_track(const Vector &p)
 	return layout.pick_track(Vector(start.x, start.y, start.z), Vector(ray.x, ray.y, ray.z));
 }
 
-void Engineer::train_added(Train &train)
+void Engineer::process_new_train(Train &train)
 {
 	TrainPanel *tpanel = new TrainPanel(*this, train);
 	root->add(*tpanel);
@@ -402,15 +406,21 @@ void Engineer::train_added(Train &train)
 	Vehicle3D &loco3d = layout_3d.get_vehicle(train.get_vehicle(0));
 	overlay->set_label(loco3d, train.get_name());
 	train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d)));
+}
+
+void Engineer::train_added(Train &train)
+{
+	new_trains.push_back(&train);
 
 	GL::Color best_color;
 	float best_d_sq = 0;
 	for(unsigned i=0; i<10; ++i)
 	{
 		GL::Color color;
-		color.r = rand()*1.0/RAND_MAX;
-		color.g = rand()*1.0/RAND_MAX;
-		color.b = rand()*1.0/RAND_MAX;
+		unsigned h = rand()%3;
+		color.r = (h==0 ? 0.0 : rand()*1.0/RAND_MAX);
+		color.g = (h==1 ? 0.0 : rand()*1.0/RAND_MAX);
+		color.b = (h==2 ? 0.0 : rand()*1.0/RAND_MAX);
 		color = color*(1/max(max(color.r, color.g), color.b));
 		float min_d_sq = 3;
 		for(map<Train *, GL::Color>::const_iterator j=train_colors.begin(); j!=train_colors.end(); ++j)