X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.cpp;h=1699fd8eeef1cf0b89618cb806d3c6623aabc07b;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=6b89fa8743b604036ccab17c7a42a48e94e8c208;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp
index 6b89fa8..1699fd8 100644
--- a/source/libr2c2/vehicle.cpp
+++ b/source/libr2c2/vehicle.cpp
@@ -41,7 +41,7 @@ Vehicle::~Vehicle()
 void Vehicle::attach_back(Vehicle &veh)
 {
 	if(next || veh.prev)
-		throw InvalidState("Already attached");
+		throw attachment_error("already attached");
 
 	next = &veh;
 	veh.prev = this;
@@ -53,7 +53,7 @@ void Vehicle::attach_back(Vehicle &veh)
 void Vehicle::attach_front(Vehicle &veh)
 {
 	if(prev || veh.next)
-		throw InvalidState("Already attached");
+		throw attachment_error("already attached");
 
 	prev = &veh;
 	veh.next = this;
@@ -65,7 +65,7 @@ void Vehicle::attach_front(Vehicle &veh)
 void Vehicle::detach_back()
 {
 	if(!next)
-		throw InvalidState("Not attached");
+		throw attachment_error("not attached");
 
 	next->prev = 0;
 	next = 0;
@@ -74,7 +74,7 @@ void Vehicle::detach_back()
 void Vehicle::detach_front()
 {
 	if(!prev)
-		throw InvalidState("Not attached");
+		throw attachment_error("not attached");
 
 	prev->next = 0;
 	prev = 0;
@@ -121,30 +121,30 @@ void Vehicle::advance(float d)
 const Vehicle::Axle &Vehicle::get_fixed_axle(unsigned i) const
 {
 	if(i>=axles.size())
-		throw InvalidParameterValue("Axle index out of range");
+		throw out_of_range("Vehicle::get_fixed_axle");
 	return axles[i];
 }
 
 const Vehicle::Bogie &Vehicle::get_bogie(unsigned i) const
 {
 	if(i>=bogies.size())
-		throw InvalidParameterValue("Bogie index out of range");
+		throw out_of_range("Vehicle::get_bogie");
 	return bogies[i];
 }
 
 const Vehicle::Axle &Vehicle::get_bogie_axle(unsigned i, unsigned j) const
 {
 	if(i>=bogies.size())
-		throw InvalidParameterValue("Bogie index out of range");
+		throw out_of_range("Vehicle::get_bogie_axle");
 	if(j>=bogies[i].axles.size())
-		throw InvalidParameterValue("Axle index out of range");
+		throw out_of_range("Vehicle::get_bogie_axle");
 	return bogies[i].axles[j];
 }
 
 const Vehicle::Rod &Vehicle::get_rod(unsigned i) const
 {
 	if(i>=rods.size())
-		throw InvalidParameterValue("Rod index out of range");
+		throw out_of_range("Vehicle::get_rod");
 	return rods[i];
 }