X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicletype.cpp;h=427c29fe91664aa98030487f19d299128531a187;hb=d5cac397cab236ac3e1e0bbbc38204890f87d164;hp=27fb883a985241ef12b66ea8a4e56d5cff9f91b3;hpb=8dce175e31941c2f6e92ce52204e9b61a071d4f9;p=r2c2.git

diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp
index 27fb883..427c29f 100644
--- a/source/3d/vehicletype.cpp
+++ b/source/3d/vehicletype.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gl/meshbuilder.h>
 #include <msp/gl/technique.h>
 #include <msp/gl/texture2d.h>
@@ -39,7 +32,7 @@ VehicleType3D::VehicleType3D(Catalogue3D &c, const VehicleType &t):
 {
 	body_object = get_object(type.get_object());
 
-	const vector<VehicleType::Axle> &axles = type.get_axles();
+	const vector<VehicleType::Axle> &axles = type.get_fixed_axles();
 	for(vector<VehicleType::Axle>::const_iterator i=axles.begin(); i!=axles.end(); ++i)
 		axle_objects[0].push_back(get_object(i->object));
 
@@ -63,33 +56,33 @@ VehicleType3D::~VehicleType3D()
 		delete i->second;
 }
 
-const GL::Object *VehicleType3D::get_axle_object(unsigned i) const
+const GL::Object *VehicleType3D::get_fixed_axle_object(unsigned i) const
 {
 	if(i>=axle_objects[0].size())
-		throw InvalidParameterValue("Axle index out of range");
+		throw out_of_range("VehicleType3D::get_fixed_axle_object");
 	return axle_objects[0][i];
 }
 
 const GL::Object *VehicleType3D::get_bogie_object(unsigned i) const
 {
 	if(i>=bogie_objects.size())
-		throw InvalidParameterValue("Bogie index out of range");
+		throw out_of_range("VehicleType3D::get_bogie_object");
 	return bogie_objects[i];
 }
 
 const GL::Object *VehicleType3D::get_bogie_axle_object(unsigned i, unsigned j) const
 {
 	if(i>=bogie_objects.size())
-		throw InvalidParameterValue("Bogie index out of range");
+		throw out_of_range("VehicleType3D::get_bogie_axle_object");
 	if(j>=axle_objects[i+1].size())
-		throw InvalidParameterValue("Axle index out of range");
+		throw out_of_range("VehicleType3D::get_bogie_axle_object");
 	return axle_objects[i+1][j];
 }
 
 const GL::Object *VehicleType3D::get_rod_object(unsigned i) const
 {
 	if(i>=rod_objects.size())
-		throw InvalidParameterValue("Rod index out of range");
+		throw out_of_range("VehicleType3D::get_rod_object");
 	return rod_objects[i];
 }
 
@@ -107,9 +100,9 @@ GL::Object *VehicleType3D::get_object(const string &name)
 			string kind = name.substr(1, colon-1);
 
 			map<string, string> params;
-			params["length"] = lexical_cast(type.get_length()*1000);
-			params["width"] = lexical_cast(type.get_width()*1000);
-			params["height"] = lexical_cast(type.get_height()*1000);
+			params["length"] = lexical_cast<string>(type.get_length()*1000);
+			params["width"] = lexical_cast<string>(type.get_width()*1000);
+			params["height"] = lexical_cast<string>(type.get_height()*1000);
 			if(colon!=string::npos)
 			{
 				string::size_type start = colon+1;