X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=36412cfeb017f857efd354c30e8e8e85c1f33fcd;hb=32cf18ff4306b36f2ce59d41056f888638a85578;hp=68533bc11520114862acfed734c50cd07c91010b;hpb=f74a48e60ff2e818ada3bbbfcb200e5cd2b633d6;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 68533bc..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; @@ -145,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,8 +174,8 @@ void Engineer::tick() layout_3d.tick(); event_disp.tick(Time::zero); - for(list::iterator i=train_views.begin(); i!=train_views.end(); ++i) - (*i)->prepare(); + for(list::iterator i=dyn_dialogs.begin(); i!=dyn_dialogs.end(); ++i) + (*i)->update(); Time::TimeStamp t = Time::now(); if(status_timeout && t>status_timeout)