-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#ifndef LIBR2C2_TRAIN_H_
#define LIBR2C2_TRAIN_H_
#include <sigc++/signal.h>
#include <sigc++/trackable.h>
+#include <msp/datafile/objectloader.h>
#include <msp/time/timestamp.h>
#include "block.h"
#include "blockiter.h"
class Train: public sigc::trackable
{
public:
- class Loader: public Msp::DataFile::BasicLoader<Train>
+ class Loader: public Msp::DataFile::ObjectLoader<Train>
{
private:
Block *prev_block;
void control_changed(const Controller::Control &);
void loco_speed_event(unsigned, unsigned, bool);
void loco_func_event(unsigned, unsigned, bool);
- void sensor_event(unsigned, bool);
+ void block_state_changed(Block &, Block::State);
void turnout_path_changed(Track &);
void halt_event(bool);
void block_reserved(const Block &, const Train *);