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

Enable vehicle variable 61 for ships

Browse Source 
Bump multi_part_ships feature version, add to documentation
This commit is contained in:
Jonathan G Rennison
2023-06-26 00:18:11 +01:00
parent e94f9699de
commit 3b2e917ca4
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/newgrf-additions.html
View File

@@ -48,6 +48,7 @@
<li><a href="#a0objects">Action 0 - Objects</a></li>
<li><a href="#variable-mapping">Action 14 - Variable Mapping for Variational Action 2</a></li>
<li><a href="#varaction2_additional_types">Variational Action 2 - Additional Types</a></li>
<li><a href="#varaction2_vehicles">Variational Action 2 - Vehicles</a></li>
<li><a href="#varaction2_station">Variational Action 2 - Stations</a></li>
<li><a href="#varaction2_railtypes">Variational Action 2 - Railtypes</a></li>
<li><a href="#varaction2_object">Variational Action 2 - Objects</a></li>
@@ -779,6 +780,10 @@
Bit 7 of the <font face="monospace">mode</font> byte must be set to use temporary variable 0x100 instead.</p>
<p>Note: Using temporary variable 0x100 as the offset should be used with caution.</p>
<br />
<h3 id="varaction2_vehicles"><a href="https://newgrf-specs.tt-wiki.net/wiki/VariationalAction2/Vehicles">Variational Action 2 - Vehicles</a></h3>
<h4 id="varaction2_vehicles_var61">Query variable of n-th vehicle in chain (61)</h4>
<p>This variable is also enabled for ships if indicated by the feature name: <font face="monospace">multi_part_ships</font>, version 2.</p>
<br />
<h3 id="varaction2_station"><a href="https://newgrf-specs.tt-wiki.net/wiki/VariationalAction2/Stations">Variational Action 2 - Stations</a></h3>
<h4 id="varaction2_station_var42">Track type in purchase list (42)</h4>
<p>This is indicated by the feature name: <font face="monospace">varaction2_station_var42</font>, version 1</p>

2
src/newgrf_engine.cpp
View File

@@ -772,7 +772,7 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object,
}
case 0x61: // Get variable of n-th vehicle in chain [signed number relative to vehicle]
if (!v->IsGroundVehicle() || parameter == 0x61) {
if (!(v->IsGroundVehicle() || v->type == VEH_SHIP) || parameter == 0x61) {
/* Not available */
break;
}

2
src/newgrf_extension.cpp
View File

@@ -70,7 +70,7 @@ extern const GRFFeatureInfo _grf_feature_list[] = {
GRFFeatureInfo("town_zone_callback", 1, GFTOF_TOWN_ZONE_CALLBACK),
GRFFeatureInfo("varaction2_towns_town_xy", 1),
GRFFeatureInfo("more_varaction2_types", 1, GFTOF_MORE_VARACTION2_TYPES),
GRFFeatureInfo("multi_part_ships", 1, GFTOF_MULTI_PART_SHIPS),
GRFFeatureInfo("multi_part_ships", 2, GFTOF_MULTI_PART_SHIPS),
GRFFeatureInfo("more_stations_per_grf", 1),
GRFFeatureInfo(),
};