Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/release-linux.yml # .github/workflows/release.yml # src/rail_cmd.cpp # src/rail_gui.cpp # src/script/api/script_rail.cpp # src/settings_gui.cpp # src/signal_type.h # src/video/sdl2_v.cpp
This commit is contained in:
@@ -395,7 +395,7 @@ public:
|
||||
case SIGTYPE_PROG:
|
||||
case SIGTYPE_COMBO:
|
||||
case SIGTYPE_EXIT: cost += Yapf().PfGetSettings().rail_firstred_exit_penalty; break; // first signal is red pre-signal-exit
|
||||
case SIGTYPE_NORMAL:
|
||||
case SIGTYPE_BLOCK:
|
||||
case SIGTYPE_ENTRY: cost += Yapf().PfGetSettings().rail_firstred_penalty; break;
|
||||
default: break;
|
||||
}
|
||||
|
@@ -150,7 +150,7 @@ struct CYapfRailNodeT
|
||||
m_last_non_reserve_through_signal_tile = INVALID_TILE;
|
||||
m_last_non_reserve_through_signal_td = INVALID_TRACKDIR;
|
||||
flags_u.m_inherited_flags = 0;
|
||||
m_last_red_signal_type = SIGTYPE_NORMAL;
|
||||
m_last_red_signal_type = SIGTYPE_BLOCK;
|
||||
/* We use PBS as initial signal type because if we are in
|
||||
* a PBS section and need to route, i.e. we're at a safe
|
||||
* waiting point of a station, we need to account for the
|
||||
|
Reference in New Issue
Block a user