Fix some uninitialized variable warnings

[r2c2.git] / source / libmarklin / train.cpp

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 38f1c765aead156f1e6b6a16f2df9d8c542c1079..b87447f625fa31a897769987140d8da44b6e0c74 100644 (file)
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -215,7 +215,7 @@ bool Train::set_route(const Route *r)
                TrackIter next = (rsv_blocks.empty() ? cur_blocks : rsv_blocks).back().next().track_iter();
                if(!r->has_track(*next))
                {
-                       lead = Route::find(*next, next.entry(), *r);
+                       lead = Route::find(next, *r);
                        if(!lead)
                                return false;
                        create_lead_route(lead, lead);
@@ -252,7 +252,7 @@ bool Train::go_to(Track &to)
 
        TrackIter next = (rsv_blocks.empty() ? cur_blocks : rsv_blocks).back().next().track_iter();
 
-       Route *route = Route::find(*next, next.entry(), to);
+       Route *route = Route::find(next, to);
        if(!route)
                return false;
        create_lead_route(route, route);
@@ -314,12 +314,10 @@ bool Train::divert(Track &from)
        if(!track)
                return false;
 
-       unsigned ep = track->get_endpoint_by_link(from);
-
        set<Track *> tracks;
        for(list<RouteRef>::iterator i=routes.begin(); i!=routes.end(); ++i)
                tracks.insert(i->route->get_tracks().begin(), i->route->get_tracks().end());
-       RefPtr<Route> diversion = Route::find(*track, ep, tracks);
+       RefPtr<Route> diversion = Route::find(track, tracks);
        if(!diversion)
                return false;
 
@@ -1431,9 +1429,9 @@ void Train::Loader::timetable()
        load_sub(*obj.timetable);
 }
 
-void Train::Loader::vehicle(unsigned n)
+void Train::Loader::vehicle(ArticleNumber art_nr)
 {
-       const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(n);
+       const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr);
        Vehicle *veh = new Vehicle(obj.layout, vtype);
        obj.vehicles.back()->attach_back(*veh);
        obj.vehicles.push_back(veh);