Update #includes that have been renamed, and remove stray ones

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

diff --git a/source/libr2c2/vehicletype.h b/source/libr2c2/vehicletype.h
index 97942af02c2381eec34e4fc5fb1fd5a11dd47379..d9afdbce8c00aa60f4e32e224c782176cd239b22 100644 (file)
--- a/source/libr2c2/vehicletype.h
+++ b/source/libr2c2/vehicletype.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_VEHICLETYPE_H_
 #define LIBR2C2_VEHICLETYPE_H_
 
@@ -129,11 +122,14 @@ public:
 
        typedef std::vector<Rod> RodArray;
 
+       typedef std::map<unsigned, std::string> FunctionMap;
+
 private:
        ArticleNumber art_nr;
        std::string name;
        bool locomotive;
-       std::map<unsigned, std::string> functions;
+       FunctionMap functions;
+       bool swap_direction;
        float length;
        float width;
        float height;
@@ -149,12 +145,13 @@ public:
        const std::string &get_name() const { return name; }
        bool is_locomotive() const { return locomotive; }
        unsigned get_max_function() const;
-       const std::map<unsigned, std::string> &get_functions() const { return functions; }
+       const FunctionMap &get_functions() const { return functions; }
+       bool get_swap_direction() const { return swap_direction; }
        float get_length() const { return length; }
        float get_width() const { return width; }
        float get_height() const { return height; }
-       const AxleArray &get_axles() const { return axles; }
-       const Axle &get_axle(unsigned) const;
+       const AxleArray &get_fixed_axles() const { return axles; }
+       const Axle &get_fixed_axle(unsigned) const;
        const BogieArray &get_bogies() const { return bogies; }
        const Bogie &get_bogie(unsigned) const;
        const Axle &get_bogie_axle(unsigned, unsigned) const;