Move speed quantization into a separate class

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

diff --git a/source/libr2c2/vehicle.h b/source/libr2c2/vehicle.h
index 1f118cc579b15c76a90b9eb86c686e7f82d5c0a9..ce56666f473f93f0222d3b209c292e6cf712fafb 100644 (file)
--- a/source/libr2c2/vehicle.h
+++ b/source/libr2c2/vehicle.h
@@ -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
 */
 
@@ -48,7 +48,7 @@ public:
        struct Rod
        {
                const VehicleType::Rod *type;
-               Point position;
+               Vector position;
                float angle;
 
                Rod(const VehicleType::Rod &);
@@ -72,7 +72,7 @@ private:
        Vehicle *next;
        Vehicle *prev;
        TrackPosition track_pos;
-       Point position;
+       Vector position;
        float direction;
        std::vector<Axle> axles;
        std::vector<Bogie> bogies;
@@ -99,9 +99,9 @@ public:
        Track *get_track() const { return track_pos.track; }
        unsigned get_entry() const { return track_pos.ep; }
        float get_offset() const { return track_pos.offs; }
-       const Point &get_position() const { return position; }
+       const Vector &get_position() const { return position; }
        float get_direction() const { return direction; }
-       const Axle &get_axle(unsigned) const;
+       const Axle &get_fixed_axle(unsigned) const;
        const Bogie &get_bogie(unsigned) const;
        const Axle &get_bogie_axle(unsigned, unsigned) const;
        const Rod &get_rod(unsigned) const;
@@ -116,7 +116,7 @@ private:
        void update_rods();
 
        void adjust_for_distance(TrackPosition &, TrackPosition &, float, float = 0.5) const;
-       TrackPoint get_point(const Point &, const Point &, float = 0.5) const;
+       TrackPoint get_point(const Vector &, const Vector &, float = 0.5) const;
        TrackPoint get_point(const TrackPosition &, float, float = 0.5) const;
 };