Handle sensors in a separate class

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

diff --git a/source/libr2c2/vehicletype.cpp b/source/libr2c2/vehicletype.cpp
index 9f8814652770448aa1ae1dc84f5b4d542f4e167a..973070ceafc158fe2fddfd4fb966115c5c1ca2a6 100644 (file)
--- a/source/libr2c2/vehicletype.cpp
+++ b/source/libr2c2/vehicletype.cpp
@@ -1,4 +1,5 @@
 #include <msp/core/maputils.h>
+#include <msp/strings/format.h>
 #include "vehicletype.h"
 
 using namespace std;
@@ -7,12 +8,13 @@ using namespace Msp;
 namespace R2C2 {
 
 VehicleType::VehicleType(const ArticleNumber &an):
-       art_nr(an),
+       ObjectType(an),
        locomotive(false),
        swap_direction(false),
        length(0),
        width(0),
-       height(0)
+       height(0),
+       rotate_object(false)
 { }
 
 unsigned VehicleType::get_max_function() const
@@ -25,30 +27,30 @@ unsigned VehicleType::get_max_function() const
 const VehicleType::Axle &VehicleType::get_fixed_axle(unsigned i) const
 {
        if(i>=axles.size())
-               throw InvalidParameterValue("Axle index out of range");
+               throw out_of_range("VehicleType::get_fixed_axle");
        return axles[i];
 }
 
 const VehicleType::Bogie &VehicleType::get_bogie(unsigned i) const
 {
        if(i>=bogies.size())
-               throw InvalidParameterValue("Axle index out of range");
+               throw out_of_range("VehicleType::get_bogie");
        return bogies[i];
 }
 
 const VehicleType::Axle &VehicleType::get_bogie_axle(unsigned i, unsigned j) const
 {
        if(i>=bogies.size())
-               throw InvalidParameterValue("Axle index out of range");
+               throw out_of_range("VehicleType::get_bogie_axle");
        if(j>=bogies[i].axles.size())
-               throw InvalidParameterValue("Axle index out of range");
+               throw out_of_range("VehicleType::get_bogie_axle");
        return bogies[i].axles[j];
 }
 
 const VehicleType::Rod &VehicleType::get_rod(unsigned i) const
 {
        if(i>=rods.size())
-               throw InvalidParameterValue("Rod index out of range");
+               throw out_of_range("VehicleType::get_rod");
        return rods[i];
 }
 
@@ -103,7 +105,7 @@ VehicleType::Rod::Rod():
 
 
 VehicleType::Loader::Loader(VehicleType &vt):
-       DataFile::ObjectLoader<VehicleType>(vt)
+       DataFile::DerivedObjectLoader<VehicleType, ObjectType::Loader>(vt)
 {
        add("axle",       &Loader::axle);
        add("bogie",      &Loader::bogie);
@@ -111,9 +113,9 @@ VehicleType::Loader::Loader(VehicleType &vt):
        add("height",     &Loader::height);
        add("length",     &Loader::length);
        add("locomotive", &VehicleType::locomotive);
-       add("name",       &VehicleType::name);
        add("object",     &VehicleType::object);
        add("rod",        &Loader::rod);
+       add("rotate_object", &VehicleType::rotate_object);
        add("swap_direction", &VehicleType::swap_direction);
        add("width",      &Loader::width);
 }
@@ -274,7 +276,7 @@ void operator>>(const LexicalConverter &c, VehicleType::Rod::Limit &l)
        else if(s=="SLIDE_X")
                l = VehicleType::Rod::SLIDE_X;
        else
-               throw LexicalError("Invalid value for Rod::Limit");
+               throw lexical_error(format("conversion of '%s' to Rod::Limit", s));
 }
 
 } // namespace R2C2