X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=bda1314ce6528a8f4721ca1ed2e9933c1bdbe0b4;hb=85362cce505281c1d281c959e135c9f8fa12bd5c;hp=d826a780381990b6a471c0e47f7b56053e062d71;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h index d826a78..bda1314 100644 --- a/source/3d/catalogue.h +++ b/source/3d/catalogue.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_CATALOGUE_H_ -#define MARKLIN3D_CATALOGUE_H_ +#ifndef R2C2_3D_CATALOGUE_H_ +#define R2C2_3D_CATALOGUE_H_ #include #include -#include "libmarklin/catalogue.h" +#include "libr2c2/catalogue.h" -namespace Marklin { +namespace R2C2 { class TrackType3D; class VehicleType3D; @@ -39,7 +39,7 @@ public: const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; } private: void track_added(const TrackType &); - void loco_added(const LocoType &); + void vehicle_added(const VehicleType &); void build_endpoint_mesh(); };