X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=936f74aa82d6d522bb74a7d500a59eeecea0f2d2;hb=e6b49ce4c5833ab90733aee8e42413f7c75d9da7;hp=5f1b46bd950f625fb04581565d7bc849c4a224ad;hpb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 5f1b46b..936f74a 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -64,7 +64,7 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	overshoot_dist(false)
 {
 	if(!loco_type.is_locomotive())
-		throw InvalidParameterValue("Initial vehicle must be a locomotive");
+		throw invalid_argument("Train::Train");
 
 	unsigned speed_steps = layout.get_driver().get_protocol_speed_steps(protocol);
 	if(speed_steps)
@@ -126,9 +126,9 @@ void Train::add_vehicle(const VehicleType &vt)
 void Train::remove_vehicle(unsigned i)
 {
 	if(i>=vehicles.size())
-		throw InvalidParameterValue("Vehicle index out of range");
+		throw out_of_range("Train::remove_vehicle");
 	if(i==0)
-		throw InvalidParameterValue("Can't remove the locomotive");
+		throw logic_error("can't remove locomotive");
 	delete vehicles[i];
 	vehicles.erase(vehicles.begin()+i);
 	if(i<vehicles.size())
@@ -143,14 +143,14 @@ unsigned Train::get_n_vehicles() const
 Vehicle &Train::get_vehicle(unsigned i)
 {
 	if(i>=vehicles.size())
-		throw InvalidParameterValue("Vehicle index out of range");
+		throw out_of_range("Train::get_vehicle");
 	return *vehicles[i];
 }
 
 const Vehicle &Train::get_vehicle(unsigned i) const
 {
 	if(i>=vehicles.size())
-		throw InvalidParameterValue("Vehicle index out of range");
+		throw out_of_range("Train::get_vehicle");
 	return *vehicles[i];
 }
 
@@ -164,7 +164,7 @@ void Train::set_active(bool a)
 	if(a==active)
 		return;
 	if(!a && controller->get_speed())
-		throw InvalidState("Can't deactivate while moving");
+		throw logic_error("moving");
 
 	active = a;
 	if(active)
@@ -179,7 +179,7 @@ void Train::set_active(bool a)
 void Train::set_function(unsigned func, bool state)
 {
 	if(!loco_type.get_functions().count(func))
-		throw InvalidParameterValue("Invalid function");
+		throw invalid_argument("Train::set_function");
 	layout.get_driver().set_loco_function(address, func, state);
 }
 
@@ -321,7 +321,7 @@ bool Train::go_to(const Zone &to)
 bool Train::divert(Track &from)
 {
 	if(!from.get_turnout_id())
-		throw InvalidParameterValue("Can't divert from a non-turnout");
+		throw invalid_argument("Train::divert");
 	if(routes.empty())
 		return false;
 
@@ -395,7 +395,7 @@ bool Train::divert(Track &from)
 		if(end!=routes.end())
 			break;
 		else if(!diversion->has_track(*track))
-			throw LogicError("Pathfinder returned a bad route");
+			throw logic_error("bad diversion");
 
 		track = track.next(diversion->get_path(*track));
 	}
@@ -423,7 +423,7 @@ const Route *Train::get_route() const
 void Train::place(Block &block, unsigned entry)
 {
 	if(controller->get_speed())
-		throw InvalidState("Must be stopped before placing");
+		throw logic_error("moving");
 
 	release_blocks();
 
@@ -449,7 +449,7 @@ void Train::place(Block &block, unsigned entry)
 void Train::unplace()
 {
 	if(controller->get_speed())
-		throw InvalidState("Must be stopped before unplacing");
+		throw logic_error("moving");
 
 	release_blocks();
 
@@ -542,7 +542,7 @@ void Train::free_noncritical_blocks()
 	}
 }
 
-int Train::get_entry_to_block(Block &block) const
+int Train::get_entry_to_block(const Block &block) const
 {
 	for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		if(i->block()==&block)
@@ -977,7 +977,7 @@ void Train::reserve_more()
 			Train *other_train = block->get_train();
 			int other_entry = other_train->get_entry_to_block(*block);
 			if(other_entry<0)
-				throw LogicError("Block reservation inconsistency");
+				throw logic_error("block reservation inconsistency");
 
 			unsigned exit = block.reverse().entry();
 			unsigned other_exit = BlockIter(block.block(), other_entry).reverse().entry();
@@ -1105,6 +1105,8 @@ void Train::check_turnout_paths(bool set)
 
 		if(i==clear_blocks_end)
 			++clear_blocks_end;
+		if(i==cur_blocks_end && !(*i)->get_sensor_id())
+			++cur_blocks_end;
 	}
 }
 
@@ -1289,7 +1291,7 @@ Train::RouteRef::RouteRef(const Route *r, unsigned d):
 
 
 Train::Loader::Loader(Train &t):
-	DataFile::BasicLoader<Train>(t),
+	DataFile::ObjectLoader<Train>(t),
 	prev_block(0),
 	blocks_valid(true)
 {