X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fzone.cpp;h=eb5d102b8414570ff6d01578b04994d675701205;hb=d84f187ca34a6ab2f8c37d85fa13d5c113714344;hp=de774431b971605f4298f2dd12b78116061bc70c;hpb=9a2fd67cec715e371e293be638b126e0d1b2148d;p=r2c2.git diff --git a/source/libr2c2/zone.cpp b/source/libr2c2/zone.cpp index de77443..eb5d102 100644 --- a/source/libr2c2/zone.cpp +++ b/source/libr2c2/zone.cpp @@ -147,16 +147,6 @@ TrackIter Zone::iter_for(Track &track, Direction dir) const return TrackIter(); } -TrackIter Zone::get_end(Direction dir) const -{ - if(dir==UNSPECIFIED) - return ends[0]; - if(up_end<0) - return TrackIter(); - - return ends[up_end^(dir==DOWN)]; -} - TrackIter Zone::next_iter(const TrackIter &iter) const { TrackIter next_outside; @@ -174,6 +164,16 @@ TrackIter Zone::next_iter(const TrackIter &iter) const return next_outside; } +TrackIter Zone::get_end(Direction dir) const +{ + if(dir==UNSPECIFIED) + return ends[0]; + if(up_end<0) + return TrackIter(); + + return ends[up_end^(dir==DOWN)]; +} + void Zone::save(list &st) const { st.push_back((DataFile::Statement("group"), group)); @@ -215,7 +215,11 @@ void Zone::save(list &st) const DataFile::Statement Zone::save_reference() const { - return (DataFile::Statement("zone"), group, number); + DataFile::Statement st("zone"); + st.append(group); + if(number) + st.append(number); + return st; }