X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=36412cfeb017f857efd354c30e8e8e85c1f33fcd;hb=d990c03a06a494ce3596862ce61e2a5684dea7e1;hp=07ab83b67eb3c086b6aa29e95c68f0bfbea174cd;hpb=7b0f113892d7202c17bb873ade72e5e74dbaffa4;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 07ab83b..36412cf 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -25,11 +25,11 @@
 #include "3d/track.h"
 #include "3d/trackcircuit.h"
 #include "3d/vehicle.h"
+#include "dynamicdialog.h"
 #include "engineer.h"
 #include "mainwindow.h"
 #include "newtraindialog.h"
 #include "traindialog.h"
-#include "trainview.h"
 
 using namespace std;
 using namespace R2C2;
@@ -40,7 +40,7 @@ Engineer::Engineer(int argc, char **argv):
 	window(options.screen_w, options.screen_h, options.fullscreen),
 	keyboard(window),
 	mouse(window),
-	ui_res("r2c2.res"),
+	ui_res("data/r2c2.res"),
 	import_active(false),
 	layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
 	layout_3d(layout),
@@ -69,10 +69,7 @@ Engineer::Engineer(int argc, char **argv):
 	overlay = new Overlay3D(ui_res.get_default_font());
 
 	// Setup railroad control
-	DataFile::load(catalogue, "tracks.dat");
-	DataFile::load(catalogue, "locos.dat");
-	DataFile::load(catalogue, "wagons.dat");
-	DataFile::load(catalogue, "terrain.dat");
+	catalogue.add_source("data/Märklin/H0");
 	DataFile::load(layout, options.layout_fn);
 
 	if(layout.has_driver())
@@ -148,14 +145,14 @@ void Engineer::set_status(const string &text)
 	status_timeout = Time::now()+10*Time::sec;
 }
 
-void Engineer::add_train_view(TrainView &tv)
+void Engineer::add_dynamic_dialog(DynamicDialog &tv)
 {
-	train_views.push_back(&tv);
+	dyn_dialogs.push_back(&tv);
 }
 
-void Engineer::remove_train_view(TrainView &tv)
+void Engineer::remove_dynamic_dialog(DynamicDialog &tv)
 {
-	train_views.erase(remove(train_views.begin(), train_views.end(), &tv), train_views.end());
+	dyn_dialogs.erase(remove(dyn_dialogs.begin(), dyn_dialogs.end(), &tv), dyn_dialogs.end());
 }
 
 int Engineer::main()
@@ -174,10 +171,11 @@ void Engineer::tick()
 	new_trains.clear();
 
 	layout.tick();
+	layout_3d.tick();
 	event_disp.tick(Time::zero);
 
-	for(list<TrainView *>::iterator i=train_views.begin(); i!=train_views.end(); ++i)
-		(*i)->prepare();
+	for(list<DynamicDialog *>::iterator i=dyn_dialogs.begin(); i!=dyn_dialogs.end(); ++i)
+		(*i)->update();
 
 	Time::TimeStamp t = Time::now();
 	if(status_timeout && t>status_timeout)
@@ -308,18 +306,21 @@ Object *Engineer::pick_object(const Vector &p)
 	GL::Vector4 ray = main_view.get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0));
 
 	// XXX Do this better; make this function a template?
-	if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, Vector(ray))))
+	if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, ray.slice<3>(0))))
 		return veh;
-	return layout.pick<Track>(Ray(start, Vector(ray)));
+	return layout.pick<Track>(Ray(start, ray.slice<3>(0)));
 }
 
 void Engineer::emergency(Block *block, const string &msg)
 {
 	set_status(msg);
-	TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
-	tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
-	tch3d->set_layer(2);
-	emergencies.push_back(tch3d);
+	if(block)
+	{
+		TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
+		tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
+		tch3d->set_layer(2);
+		emergencies.push_back(tch3d);
+	}
 }
 
 void Engineer::halt_event(bool h)