Add a vehicle property for swapping directions

[r2c2.git] / source / libr2c2 / vehicletype.cpp

diff --git a/source/libr2c2/vehicletype.cpp b/source/libr2c2/vehicletype.cpp
index 4f640193d025f433a86c81a2d5813c112200890d..6c9d387ad7978f1da7ae4d65701050633eabe719 100644 (file)
--- a/source/libr2c2/vehicletype.cpp
+++ b/source/libr2c2/vehicletype.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -15,6 +15,7 @@ namespace R2C2 {
 VehicleType::VehicleType(const ArticleNumber &an):
        art_nr(an),
        locomotive(false),
+       swap_direction(false),
        length(0),
        width(0),
        height(0)
@@ -27,7 +28,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 +120,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);
 }
 
@@ -232,8 +234,8 @@ void VehicleType::Rod::Loader::connect(const string &t, float px, float pz, floa
        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_point = Vector(px/1000, 0, pz/1000);
+       obj.connect_offset = Vector(ox/1000, 0, oz/1000);
 }
 
 void VehicleType::Rod::Loader::pivot_body()
@@ -265,7 +267,7 @@ void VehicleType::Rod::Loader::pivot_rod(const string &t)
 
 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)