From dd6a0a60863200d1ae2426e6a166e9dbbf1e6f4e Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sun, 25 Jul 2010 11:43:09 +0100 Subject: [PATCH] Rename get_covers2 to get_height_locked --- include/ITrackSegment.hpp | 2 +- src/CrossoverTrack.cpp | 4 ++-- src/CurvedTrack.cpp | 4 ++-- src/GenTrack.cpp | 4 ++-- src/Map.cpp | 10 ++++------ src/Points.cpp | 4 ++-- src/SBend.cpp | 4 ++-- src/SlopeTrack.cpp | 4 ++-- src/StraightTrack.cpp | 4 ++-- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/include/ITrackSegment.hpp b/include/ITrackSegment.hpp index f239de4..5190627 100644 --- a/include/ITrackSegment.hpp +++ b/include/ITrackSegment.hpp @@ -137,7 +137,7 @@ struct ITrackSegment : IXMLSerialisable { virtual void get_covers(vector >& output) const = 0; // Covers are tile vertices covered by the track segment - virtual void get_covers2(vector >& output) const = 0; + virtual void get_height_locked(vector >& output) const = 0; // Add an exit to this section of track possibly generating // a new track segment diff --git a/src/CrossoverTrack.cpp b/src/CrossoverTrack.cpp index f9ff3ce..9980551 100644 --- a/src/CrossoverTrack.cpp +++ b/src/CrossoverTrack.cpp @@ -48,7 +48,7 @@ public: track::Connection next_position(const track::TravelToken& a_token) const; void get_endpoints(vector >& a_list) const; void get_covers(vector >& output) const { } - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); track::TravelToken get_travel_token(track::Position a_position, track::Direction a_direction) const; @@ -189,7 +189,7 @@ void CrossoverTrack::get_endpoints(vector >& a_list) const a_list.push_back(origin); } -void CrossoverTrack::get_covers2(vector >& output) const +void CrossoverTrack::get_height_locked(vector >& output) const { output.push_back(origin + make_point(0, 0)); output.push_back(origin + make_point(0, 1)); diff --git a/src/CurvedTrack.cpp b/src/CurvedTrack.cpp index 246a294..8ae053b 100644 --- a/src/CurvedTrack.cpp +++ b/src/CurvedTrack.cpp @@ -51,7 +51,7 @@ public: bool is_valid_direction(const Direction& a_direction) const; void get_endpoints(vector >& a_list) const; void get_covers(vector >& output) const; - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); @@ -300,7 +300,7 @@ void CurvedTrack::get_covers(vector >& output) const copy(tmp.begin(), tmp.end(), back_inserter(output)); } -void CurvedTrack::get_covers2(vector >& output) const +void CurvedTrack::get_height_locked(vector >& output) const { } diff --git a/src/GenTrack.cpp b/src/GenTrack.cpp index 99cf106..6845064 100644 --- a/src/GenTrack.cpp +++ b/src/GenTrack.cpp @@ -42,7 +42,7 @@ public: track::Connection next_position(const track::TravelToken& token) const; void get_endpoints(vector >& output) const; void get_covers(vector >& output) const; - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); track::TravelToken get_travel_token(track::Position pos, track::Direction dir) const; @@ -287,7 +287,7 @@ void GenTrack::bounding_polygon(Polygon& poly) const } } -void GenTrack::get_covers2(vector >& output) const +void GenTrack::get_height_locked(vector >& output) const { for (int x = min(0, delta.x); x <= max(0, delta.x) + 1; x++) { for (int y = min(0, delta.y); y <= max(0, delta.y) + 1; y++) { diff --git a/src/Map.cpp b/src/Map.cpp index 684145d..09f7532 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -282,7 +282,7 @@ void Map::erase_tile(int x, int y) // endpoints vector > locked; - tile.track->get()->get_covers2(locked); + tile.track->get()->get_height_locked(locked); for (vector >::iterator it = locked.begin(); it != locked.end(); ++it) @@ -340,7 +340,7 @@ void Map::set_track_at(const Point& where, ITrackSegmentPtr track) // Lock every height node touched by this track segment vector > locked; - track->get_covers2(locked); + track->get_height_locked(locked); for (vector >::iterator it = locked.begin(); it != locked.end(); ++it) @@ -891,7 +891,7 @@ void Map::render_sector(IGraphicsPtr a_context, int id, #if 1 // Draw vertices covered by track vector > vertices; - tile.track->get()->get_covers2(vertices); + tile.track->get()->get_height_locked(vertices); for_each(vertices.begin(), vertices.end(), bind(&Map::highlight_vertex, this, placeholders::_1, make_colour(1.0f, 0.0f, 0.0f))); @@ -1043,10 +1043,8 @@ bool Map::raise_will_cover_track(int x, int y) const tile_vertices(x, y, indexes); bool ok = true; - for (int i = 0; i < 4; i++) { - debug() << height_map[indexes[i]].lock_count; + for (int i = 0; i < 4; i++) ok &= height_map[indexes[i]].lock_count == 0; - } return !ok; #endif diff --git a/src/Points.cpp b/src/Points.cpp index 2512e06..5d3924f 100644 --- a/src/Points.cpp +++ b/src/Points.cpp @@ -44,7 +44,7 @@ public: track::Connection next_position(const track::TravelToken& a_token) const; void get_endpoints(vector >& a_list) const; void get_covers(vector >& output) const; - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); track::TravelToken get_travel_token(track::Position a_position, track::Direction a_direction) const; @@ -561,7 +561,7 @@ void Points::get_covers(vector >& output) const assert(false); } -void Points::get_covers2(vector >& output) const +void Points::get_height_locked(vector >& output) const { } diff --git a/src/SBend.cpp b/src/SBend.cpp index cf91ca9..af417dc 100644 --- a/src/SBend.cpp +++ b/src/SBend.cpp @@ -44,7 +44,7 @@ public: track::Connection next_position(const track::TravelToken& token) const; void get_endpoints(vector >& output) const; void get_covers(vector >& output) const; - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); track::TravelToken get_travel_token(track::Position pos, track::Direction dir) const; @@ -214,7 +214,7 @@ void SBend::get_covers(vector >& output) const copy(tmp.begin(), tmp.end(), back_inserter(output)); } -void SBend::get_covers2(vector >& output) const +void SBend::get_height_locked(vector >& output) const { } diff --git a/src/SlopeTrack.cpp b/src/SlopeTrack.cpp index 17b43e2..f57f492 100644 --- a/src/SlopeTrack.cpp +++ b/src/SlopeTrack.cpp @@ -49,7 +49,7 @@ public: track::Connection next_position(const track::TravelToken& token) const; void get_endpoints(vector >& output) const; void get_covers(vector >& output) const {}; - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); bool has_multiple_states() const { return false; } @@ -262,7 +262,7 @@ void SlopeTrack::get_endpoints(vector >& output) const output.push_back(origin); } -void SlopeTrack::get_covers2(vector >& output) const +void SlopeTrack::get_height_locked(vector >& output) const { output.push_back(origin + make_point(0, 0)); output.push_back(origin + make_point(0, 1)); diff --git a/src/StraightTrack.cpp b/src/StraightTrack.cpp index 66ef30e..e76def6 100644 --- a/src/StraightTrack.cpp +++ b/src/StraightTrack.cpp @@ -50,7 +50,7 @@ public: bool is_valid_direction(const Direction& a_direction) const; void get_endpoints(vector >& a_list) const; void get_covers(vector >& output) const { } - void get_covers2(vector >& output) const; + void get_height_locked(vector >& output) const; ITrackSegmentPtr merge_exit(Point where, track::Direction dir); track::TravelToken get_travel_token(track::Position a_position, @@ -184,7 +184,7 @@ void StraightTrack::get_endpoints(vector >& a_list) const a_list.push_back(origin); } -void StraightTrack::get_covers2(vector >& output) const +void StraightTrack::get_height_locked(vector >& output) const { output.push_back(origin + make_point(0, 0)); output.push_back(origin + make_point(0, 1)); -- 2.39.2