Allow custom signal styles to disable aspect-limited mode

By setting style_lookahead_extra_aspects to 255

docs/newgrf-additions-nml.html

@@ -615,20 +615,23 @@ item (FEAT_GLOBALVARS) {
 			Set whether reserve through is unconditionally enabled for the most recently defined style (defined using the <span class="code">define_style</span> property).
 		</td>
 	</tr>
-	<tr><td>style_lookahead_extra_aspects</td><td>0 - 6</td>
+	<tr><td>style_lookahead_extra_aspects</td><td>0 - 6 or 255</td>
 		<td>
 			Set the look-ahead extra aspects for the most recently defined style (defined using the <span class="code">define_style</span> property).<br />
-			This property only makes a difference when the "limit train lookahead to signal aspect" game setting is enabled.<br />
+			This property only makes a difference when the "realistic train braking is aspect limited" game setting is enabled.<br />
 			This limits the signal aspect which the hypothetical train driver can "read" from the signal without affecting signal aspect propagation to other signals, or variable <span class="code">extra_callback_info2</span>.<br />
 			Example values could include: 1 for traditional banner repeater signals.<br />
 			Shunt signals should use <span class="code">style_lookahead_single_signal_only</span> instead.<br />
-			The value is clamped to be less than or equal to the value set in the <span class="code">extra_aspects</span> property.
+			The value is clamped to be less than or equal to the value set in the <span class="code">extra_aspects</span> property.<br />
+			<br />
+			As a special case, a value of 255 (0xFF) disables the "realistic train braking is aspect limited" setting entirely for signals using this style.<br />
+			This should only be used for signal types which are intended to emulate in-cab signalling, instead of the "driver" visually reading a signal.
 		</td>
 	</tr>
 	<tr><td>style_lookahead_single_signal_only</td><td>0 or 1</td>
 		<td>
 			Set the look-ahead to single signal only mode for the most recently defined style (defined using the <span class="code">define_style</span> property).<br />
-			This property only makes a difference when the "limit train lookahead to signal aspect" game setting is enabled, or when using a different signal
+			This property only makes a difference when the "realistic train braking is aspect limited" game setting is enabled, or when using a different signal
 			type which uses <span class="code">tyle_combined_normal_shunt</span>.<br />
 			This is similar to <span class="code">style_lookahead_extra_aspects</span> with a value of 0, except the lookahead always ends at the
 			next signal, even if that signal type sets <span class="code">style_no_aspect_increase</span>.<br />

docs/newgrf-additions.html

@@ -515,17 +515,21 @@
 	<p>This is indicated by the feature name: <font face="monospace">action0_signals_style</font>, version 1</p>
 	<h4 id="signals_style_lookahead_extra_aspects">Set custom signal style train look-ahead extra aspects (mappable property: signals_style_lookahead_extra_aspects)</h4>
 	<p>This applies to the most recent custom signal style defined using the <a href="#signals_define_style">signals_define_style</a> property.<br />
-	This property only makes a difference when the "limit train lookahead to signal aspect" game setting is enabled.<br />
+	This property only makes a difference when the "realistic train braking is aspect limited" game setting is enabled.<br />
 	This limits the signal aspect which the hypothetical train driver can "read" from the signal without affecting signal aspect propagation to other signals, or variable 0x18.<br />
 	Example values could include: 1 for traditional banner repeater signals.<br />
 	Shunt signals should use <a href="#signals_style_lookahead_single_signal_only#">signals_style_lookahead_single_signal_only</a> instead.</p>
 	<p>The property length is 1 byte. The value is clamped to be less than or equal to the value set in the <a href="#signals_extra_aspects">signals_extra_aspects</a> property.<br />
 	The Action 0 Id field is not used, the value is ignored.
 	</p>
-	<p>This is indicated by the feature name: <font face="monospace">action0_signals_style</font>, version 1</p>
+	<p>As a special case, a value of 255 (0xFF) disables the "realistic train braking is aspect limited" setting entirely for signals using this style.<br />
+	This should only be used for signal types which are intended to emulate in-cab signalling, instead of the "driver" visually reading a signal.<br />
+	This special case is indicated by the feature name <font face="monospace">action0_signals_style</font>, version 2.
+	</p>
+	<p>This property is indicated by the feature name: <font face="monospace">action0_signals_style</font>, version 1</p>
 	<h4 id="signals_style_lookahead_single_signal_only">Set custom signal style train look-ahead to single signal only mode (mappable property: signals_style_lookahead_single_signal_only)</h4>
 	<p>This applies to the most recent custom signal style defined using the <a href="#signals_define_style">signals_define_style</a> property.<br />
-	This property only makes a difference when the "limit train lookahead to signal aspect" game setting is enabled, or when using a different signal
+	This property only makes a difference when the "realistic train braking is aspect limited" game setting is enabled, or when using a different signal
 	type which uses <a href="#signals_style_combined_normal_shunt">signals_style_combined_normal_shunt</a>.<br />
 	This is similar to <a href="#signals_style_lookahead_extra_aspects">signals_style_lookahead_extra_aspects</a> with a value of 0, except the lookahead always ends at the
 	next signal, even if that signal type sets <a href="#signals_style_no_aspect_increase">signals_style_no_aspect_increase</a>.<br />

src/console_cmds.cpp

@@ -3107,7 +3107,7 @@ DEF_CONSOLE_CMD(ConDumpSignalStyles)
 			grfid = style.grffile->grfid;
 			grfs.insert(std::pair<uint32, const GRFFile *>(grfid, style.grffile));
 		}
-		IConsolePrintF(CC_DEFAULT, "  %2u: GRF: %08X, Local: %2u, Extra aspects: %2u, Flags: %c%c%c%c%c%c%c, %s",
+		IConsolePrintF(CC_DEFAULT, "  %2u: GRF: %08X, Local: %2u, Extra aspects: %3u, Flags: %c%c%c%c%c%c%c, %s",
 				(uint) (i + 1),
 				BSWAP32(grfid),
 				style.grf_local_id,

src/newgrf.cpp

@@ -4158,7 +4158,7 @@ static ChangeInfoResult SignalsChangeInfo(uint id, int numinfo, int prop, const
 
 			case A0RPI_SIGNALS_STYLE_LOOKAHEAD_EXTRA_ASPECTS: {
 				if (MappedPropertyLengthMismatch(buf, 1, mapping_entry)) break;
-				uint8 value = std::min<byte>(buf->ReadByte(), NEW_SIGNALS_MAX_EXTRA_ASPECT);
+				uint8 value = buf->ReadByte();
 				if (_cur.grffile->current_new_signal_style != nullptr) {
 					SetBit(_cur.grffile->current_new_signal_style->style_flags, NSSF_LOOKAHEAD_ASPECTS_SET);
 					_cur.grffile->current_new_signal_style->lookahead_extra_aspects = value;

src/newgrf_extension.cpp

@@ -52,7 +52,7 @@ extern const GRFFeatureInfo _grf_feature_list[] = {
 	GRFFeatureInfo("action0_signals_restricted_signals", 2),
 	GRFFeatureInfo("action0_signals_recolour", 1),
 	GRFFeatureInfo("action0_signals_extra_aspects", 1),
-	GRFFeatureInfo("action0_signals_style", 1),
+	GRFFeatureInfo("action0_signals_style", 2),
 	GRFFeatureInfo("varaction2_signals_signal_context", 1),
 	GRFFeatureInfo("varaction2_signals_signal_side", 1),
 	GRFFeatureInfo("varaction2_signals_signal_vertical_clearance", 1),

src/pbs.cpp

@@ -1133,6 +1133,10 @@ int AdvanceTrainReservationLookaheadEnd(const Train *v, int lookahead_end_positi
 				/* Signal is within visual range */
 				uint8 style = item.data_aux >> 8;
 				uint8 max_aspect = (style == 0) ? _extra_aspects : _new_signal_styles[style - 1].lookahead_extra_aspects;
+				if (max_aspect == 0xFF) {
+					/* This signal has unlimited lookahead */
+					return v->lookahead->reservation_end_position + 1;
+				}
 				if (!HasBit(item.data_aux, TRSLAI_NEXT_ONLY)) allow_skip_no_aspect_inc = true;
 				max_aspect += ((HasBit(item.data_aux, TRSLAI_NO_ASPECT_INC) && allow_skip_no_aspect_inc) ? 1 : 2);
 				if (max_aspect > known_signals_ahead) known_signals_ahead = max_aspect;

src/signal.cpp

@@ -1804,7 +1804,9 @@ static bool DetermineExtraAspectsVariable()
 			_new_signal_styles[i].lookahead_extra_aspects = 0;
 			SetBit(_signal_style_masks.next_only, i + 1);
 		} else if (HasBit(_new_signal_styles[i].style_flags, NSSF_LOOKAHEAD_ASPECTS_SET)) {
-			_new_signal_styles[i].lookahead_extra_aspects = std::min<uint8>(_new_signal_styles[i].lookahead_extra_aspects, _new_signal_styles[i].grffile->new_signal_extra_aspects);
+			if (_new_signal_styles[i].lookahead_extra_aspects != 255) {
+				_new_signal_styles[i].lookahead_extra_aspects = std::min<uint8>(_new_signal_styles[i].lookahead_extra_aspects, _new_signal_styles[i].grffile->new_signal_extra_aspects);
+			}
 		} else {
 			_new_signal_styles[i].lookahead_extra_aspects = _new_signal_styles[i].grffile->new_signal_extra_aspects;
 		}