X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.cpp;h=289c4e54f6bd14de4107f1e4246144e8438c168b;hb=a44355019e5a27da0d5e5287aae74864e4122e1f;hp=7c0409d94588caa787f1c73d440189c69de68a0b;hpb=1124a98ce5e1edee1904eeec089976d446601afd;p=r2c2.git diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp index 7c0409d..289c4e5 100644 --- a/source/libr2c2/block.cpp +++ b/source/libr2c2/block.cpp @@ -1,8 +1,8 @@ #include +#include #include #include #include "block.h" -#include "driver.h" #include "layout.h" #include "route.h" #include "trackcircuit.h" @@ -171,7 +171,7 @@ bool Block::reserve(Train *t) if(!t || !train) { train = t; - signal_reserved.emit(train); + signal_reserved.emit(t); return true; } else @@ -212,6 +212,11 @@ void Block::determine_id() signal_name_changed.emit(name); } +DataFile::Statement Block::save_reference() const +{ + return (DataFile::Statement("block"), id); +} + Block::Endpoint::Endpoint(Track *t, unsigned e): track(t),