dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tracerestrict-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-07-11 22:13:07 +01:00
parent 3ac94e97c8 7a18f9eeeb
commit cd0211095b
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pathfinder/yapf/yapf_costrail.hpp
View File

@@ -261,11 +261,19 @@ private:
} }
// returns true if dead end bit has been set // returns true if dead end bit has been set
inline bool ExecuteTraceRestrict(Node& n, TileIndex tile, Trackdir trackdir, int& cost, TraceRestrictProgramResult &out) inline bool ExecuteTraceRestrict(Node& n, TileIndex tile, Trackdir trackdir, int& cost, TraceRestrictProgramResult &out, bool *is_res_through)
{ {
const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir)); const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir));
if (prog && prog->actions_used_flags & TRPAUF_PF) { TraceRestrictProgramActionsUsedFlags flags_to_check = TRPAUF_PF;
if (is_res_through != NULL) {
*is_res_through = false;
flags_to_check |= TRPAUF_RESERVE_THROUGH;
}
if (prog && prog->actions_used_flags & flags_to_check) {
prog->Execute(Yapf().GetVehicle(), TraceRestrictProgramInput(tile, trackdir, &TraceRestrictPreviousSignalCallback, &n), out); prog->Execute(Yapf().GetVehicle(), TraceRestrictProgramInput(tile, trackdir, &TraceRestrictPreviousSignalCallback, &n), out);
if (out.flags & TRPRF_RESERVE_THROUGH && is_res_through != NULL) {
*is_res_through = true;
}
if (out.flags & TRPRF_DENY) { if (out.flags & TRPRF_DENY) {
n.m_segment->m_end_segment_reason |= ESRB_DEAD_END; n.m_segment->m_end_segment_reason |= ESRB_DEAD_END;
return true; return true;
@@ -338,9 +346,11 @@ public:
if (ShouldCheckTraceRestrict(n, tile)) { if (ShouldCheckTraceRestrict(n, tile)) {
TraceRestrictProgramResult out; TraceRestrictProgramResult out;
if (ExecuteTraceRestrict(n, tile, trackdir, cost, out)) { bool is_reserve_through = false;
if (ExecuteTraceRestrict(n, tile, trackdir, cost, out, &is_reserve_through)) {
return -1; return -1;
} }
if (is_reserve_through) n.m_num_signals_res_through_passed++;
} }
n.m_num_signals_passed++; n.m_num_signals_passed++;
@@ -353,7 +363,7 @@ public:
if (ShouldCheckTraceRestrict(n, tile)) { if (ShouldCheckTraceRestrict(n, tile)) {
TraceRestrictProgramResult out; TraceRestrictProgramResult out;
if (ExecuteTraceRestrict(n, tile, trackdir, cost, out)) { if (ExecuteTraceRestrict(n, tile, trackdir, cost, out, NULL)) {
return -1; return -1;
} }
} }

4
src/pathfinder/yapf/yapf_node_rail.hpp
View File

@@ -128,6 +128,7 @@ struct CYapfRailNodeT
CYapfRailSegment *m_segment; CYapfRailSegment *m_segment;
uint16 m_num_signals_passed; uint16 m_num_signals_passed;
uint16 m_num_signals_res_through_passed;
union { union {
uint32 m_inherited_flags; uint32 m_inherited_flags;
struct { struct {
@@ -145,6 +146,7 @@ struct CYapfRailNodeT
m_segment = NULL; m_segment = NULL;
if (parent == NULL) { if (parent == NULL) {
m_num_signals_passed = 0; m_num_signals_passed = 0;
m_num_signals_res_through_passed = 0;
flags_u.m_inherited_flags = 0; flags_u.m_inherited_flags = 0;
m_last_red_signal_type = SIGTYPE_NORMAL; m_last_red_signal_type = SIGTYPE_NORMAL;
/* We use PBS as initial signal type because if we are in /* We use PBS as initial signal type because if we are in
@@ -160,6 +162,7 @@ struct CYapfRailNodeT
m_last_signal_type = SIGTYPE_PBS; m_last_signal_type = SIGTYPE_PBS;
} else { } else {
m_num_signals_passed = parent->m_num_signals_passed; m_num_signals_passed = parent->m_num_signals_passed;
m_num_signals_res_through_passed = parent->m_num_signals_res_through_passed;
flags_u.m_inherited_flags = parent->flags_u.m_inherited_flags; flags_u.m_inherited_flags = parent->flags_u.m_inherited_flags;
m_last_red_signal_type = parent->m_last_red_signal_type; m_last_red_signal_type = parent->m_last_red_signal_type;
m_last_signal_type = parent->m_last_signal_type; m_last_signal_type = parent->m_last_signal_type;
@@ -210,6 +213,7 @@ struct CYapfRailNodeT
base::Dump(dmp); base::Dump(dmp);
dmp.WriteStructT("m_segment", m_segment); dmp.WriteStructT("m_segment", m_segment);
dmp.WriteLine("m_num_signals_passed = %d", m_num_signals_passed); dmp.WriteLine("m_num_signals_passed = %d", m_num_signals_passed);
dmp.WriteLine("m_num_signals_res_through_passed = %d", m_num_signals_res_through_passed);
dmp.WriteLine("m_targed_seen = %s", flags_u.flags_s.m_targed_seen ? "Yes" : "No"); dmp.WriteLine("m_targed_seen = %s", flags_u.flags_s.m_targed_seen ? "Yes" : "No");
dmp.WriteLine("m_choice_seen = %s", flags_u.flags_s.m_choice_seen ? "Yes" : "No"); dmp.WriteLine("m_choice_seen = %s", flags_u.flags_s.m_choice_seen ? "Yes" : "No");
dmp.WriteLine("m_last_signal_was_red = %s", flags_u.flags_s.m_last_signal_was_red ? "Yes" : "No"); dmp.WriteLine("m_last_signal_was_red = %s", flags_u.flags_s.m_last_signal_was_red ? "Yes" : "No");

4
src/pathfinder/yapf/yapf_rail.cpp
View File

@@ -168,8 +168,8 @@ public:
{ {
assert(node->m_parent != NULL); assert(node->m_parent != NULL);
/* We will never pass more than two signals, no need to check for a safe tile. */ /* We will never pass more than two non-reserve-through signals, no need to check for a safe tile. */
if (node->m_parent->m_num_signals_passed >= 2) return; if (node->m_parent->m_num_signals_passed - node->m_parent->m_num_signals_res_through_passed >= 2) return;
if (!node->IterateTiles(Yapf().GetVehicle(), Yapf(), *this, &CYapfReserveTrack<Types>::FindSafePositionProc)) { if (!node->IterateTiles(Yapf().GetVehicle(), Yapf(), *this, &CYapfReserveTrack<Types>::FindSafePositionProc)) {
m_res_node = node; m_res_node = node;