Don't crash if a train has no router

[r2c2.git] / source / 3d / vehicle.h

diff --git a/source/3d/vehicle.h b/source/3d/vehicle.h
index 84b10beb4c6bb1da3bbb514cf30c9a8cf6d59698..919845403f6d54fba3117f3e6342ff674e3ad0c2 100644 (file)
--- a/source/3d/vehicle.h
+++ b/source/3d/vehicle.h
@@ -1,34 +1,22 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef LIBR2C23D_VEHICLE_H_
-#define LIBR2C23D_VEHICLE_H_
+#ifndef R2C2_3D_VEHICLE_H_
+#define R2C2_3D_VEHICLE_H_
 
+#include <msp/gl/objectinstance.h>
 #include <msp/gl/renderable.h>
 #include "libr2c2/vehicle.h"
 #include "object.h"
 
 namespace R2C2 {
 
-class Axle3D;
-class Bogie3D;
-class Layout3D;
-class Rod3D;
+class VehiclePart3D;
 class VehicleType3D;
 
 class Vehicle3D: public Object3D, public Msp::GL::ObjectInstance
 {
 private:
-       Layout3D &layout;
        Vehicle &vehicle;
        const VehicleType3D &type;
-       std::vector<Axle3D *> axles;
-       std::vector<Bogie3D *> bogies;
-       std::vector<Rod3D *> rods;
+       std::vector<VehiclePart3D *> children;
 
 public:
        Vehicle3D(Layout3D &, Vehicle &);
@@ -37,9 +25,12 @@ public:
        Vehicle &get_vehicle() const { return vehicle; }
        const VehicleType3D &get_type() const { return type; }
 
-       virtual Point get_node() const;
+       virtual Vector get_node() const;
        virtual bool is_visible() const;
+private:
+       virtual void moved();
 
+public:
        virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
        virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 };