X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicletype.cpp;h=9f8814652770448aa1ae1dc84f5b4d542f4e167a;hb=8b828fc32fd210b6e335ac6614d269aa892d4d57;hp=4f640193d025f433a86c81a2d5813c112200890d;hpb=ce8be590703fdc0709863f0ee9695f40b6adb200;p=r2c2.git

diff --git a/source/libr2c2/vehicletype.cpp b/source/libr2c2/vehicletype.cpp
index 4f64019..9f88146 100644
--- a/source/libr2c2/vehicletype.cpp
+++ b/source/libr2c2/vehicletype.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/maputils.h>
 #include "vehicletype.h"
 
 using namespace std;
@@ -15,6 +9,7 @@ namespace R2C2 {
 VehicleType::VehicleType(const ArticleNumber &an):
 	art_nr(an),
 	locomotive(false),
+	swap_direction(false),
 	length(0),
 	width(0),
 	height(0)
@@ -27,7 +22,7 @@ unsigned VehicleType::get_max_function() const
 	return (--functions.end())->first;
 }
 
-const VehicleType::Axle &VehicleType::get_axle(unsigned i) const
+const VehicleType::Axle &VehicleType::get_fixed_axle(unsigned i) const
 {
 	if(i>=axles.size())
 		throw InvalidParameterValue("Axle index out of range");
@@ -119,6 +114,7 @@ VehicleType::Loader::Loader(VehicleType &vt):
 	add("name",       &VehicleType::name);
 	add("object",     &VehicleType::object);
 	add("rod",        &Loader::rod);
+	add("swap_direction", &VehicleType::swap_direction);
 	add("width",      &Loader::width);
 }
 
@@ -228,12 +224,9 @@ VehicleType::Rod::Loader::Loader(Rod &r, const map<string, unsigned> &t):
 
 void VehicleType::Rod::Loader::connect(const string &t, float px, float pz, float ox, float oz)
 {
-	map<string, unsigned>::const_iterator i = tags.find(t);
-	if(i==tags.end())
-		throw KeyError("Unknown rod tag", t);
-	obj.connect_index = i->second;
-	obj.connect_point = Point(px/1000, 0, pz/1000);
-	obj.connect_offset = Point(ox/1000, 0, oz/1000);
+	obj.connect_index = get_item(tags, t);
+	obj.connect_point = Vector(px/1000, 0, pz/1000);
+	obj.connect_offset = Vector(ox/1000, 0, oz/1000);
 }
 
 void VehicleType::Rod::Loader::pivot_body()
@@ -256,16 +249,13 @@ void VehicleType::Rod::Loader::pivot_bogie_axle(unsigned i, unsigned j)
 
 void VehicleType::Rod::Loader::pivot_rod(const string &t)
 {
-	map<string, unsigned>::const_iterator i = tags.find(t);
-	if(i==tags.end())
-		throw KeyError("Unknown rod tag", t);
+	obj.pivot_index = get_item(tags, t);
 	obj.pivot = ROD;
-	obj.pivot_index = i->second;
 }
 
 void VehicleType::Rod::Loader::position(float x, float y, float z)
 {
-	obj.pivot_point = Point(x/1000, y/1000, z/1000);
+	obj.pivot_point = Vector(x/1000, y/1000, z/1000);
 }
 
 void VehicleType::Rod::Loader::set_tag(const string &t)