From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 30 Mar 2014 13:46:53 +0000 (+0300)
Subject: Rename is_occupied to is_occupying
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4232c65cb556d278dee218866de77402ff888f1e;p=r2c2.git

Rename is_occupied to is_occupying

This reflects the function's actual purpose better.
---

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index e8b5d90..e813b36 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -184,7 +184,7 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c
 	return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
 }
 
-bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
+bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
 {
 	OccupiedTrack *occ = occupied_tracks;
 	for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next)
@@ -362,7 +362,7 @@ bool TrainRoutePlanner::RoutingStep::check_deadlocks() const
 int TrainRoutePlanner::RoutingStep::get_occupant(Track &track) const
 {
 	for(unsigned i=0; i<trains.size(); ++i)
-		if(trains[i].is_occupied(track))
+		if(trains[i].is_occupying(track))
 			return i;
 
 	return -1;
diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index d24c3dc..6dab635 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -69,7 +69,7 @@ private:
 		~TrainRoutingState();
 
 		Msp::Time::TimeDelta get_time_to_next_track() const;
-		bool is_occupied(Track &) const;
+		bool is_occupying(Track &) const;
 		bool check_arrival();
 		void advance(float);
 		void advance_track(unsigned);