Rename turnout/sensor_id fields in Track and Block to *_addr

[r2c2.git] / source / libr2c2 / block.cpp

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 33627f8a7cf354afd006ace1b18436090d979441..59ad3a3c990965ac67b9e0ccad5602aff5c35abb 100644 (file)
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -16,8 +16,8 @@ namespace R2C2 {
 Block::Block(Layout &l, Track &start):
        TrackChain(l),
        id(0),
-       sensor_id(start.get_sensor_id()),
-       turnout_id(start.get_turnout_id()),
+       sensor_addr(start.get_sensor_address()),
+       turnout_addr(start.get_turnout_address()),
        conflict(false),
        sensor(0),
        train(0)
@@ -49,7 +49,7 @@ Block::Block(Layout &l, Track &start):
        for(set<Block *>::const_iterator i=blocks.begin(); (!conflict && i!=blocks.end()); ++i)
                conflict = (id==(*i)->get_id());
 
-       if(!conflict && sensor_id)
+       if(!conflict && sensor_addr)
                sensor = new TrackCircuit(layout, *this);
 
        layout.add(*this);
@@ -81,7 +81,7 @@ void Block::on_track_added(Track &track)
 
 TrackChain::Validity Block::check_validity(Track &track) const
 {
-       if(track.get_sensor_id()!=sensor_id || track.get_turnout_id()!=turnout_id)
+       if(track.get_sensor_address()!=sensor_addr || track.get_turnout_address()!=turnout_addr)
                return INCOMPATIBLE;
 
        return TrackChain::check_validity(track);
@@ -174,10 +174,10 @@ bool Block::reserve(Train *t)
 
 void Block::determine_id()
 {
-       if(sensor_id)
-               id = 0x1000|sensor_id;
-       else if(turnout_id)
-               id = 0x2000|turnout_id;
+       if(sensor_addr)
+               id = 0x1000|sensor_addr;
+       else if(turnout_addr)
+               id = 0x2000|turnout_addr;
        else if(endpoints.size()==2)
        {
                unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;