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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/scripts/FindVersion.cmake
#	src/airport_gui.cpp
#	src/industry_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_class_func.h
#	src/newgrf_object.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/object_gui.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/station_cmd.h
#	src/strings.cpp
#	src/waypoint_cmd.h
This commit is contained in:
Jonathan G Rennison
2024-06-05 20:42:47 +01:00
parent 2aefeec225 a42aa1a086
commit f9b75ed304
22 changed files with 222 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/station_cmd.cpp
View File

@@ -1469,7 +1469,7 @@ static void RestoreTrainReservation(Train *v)
* - p1 = (bit 16-23) - platform length
* - p1 = (bit 24) - allow stations directly adjacent to other stations.
* @param p2 various bitstuffed elements
* - p2 = (bit 0- 7) - custom station class
* - p2 = (bit 0-15) - custom station class
* - p2 = (bit 16-31) - station ID to join (NEW_STATION if build new one)
* @param p3 various bitstuffed elements
* - p3 = (bit 0-15) - custom station id
@@ -1485,7 +1485,7 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32_
uint8_t plat_len = GB(p1, 16, 8);
bool adjacent = HasBit(p1, 24);
StationClassID spec_class = Extract<StationClassID, 0, 8>(p2);
StationClassID spec_class = Extract<StationClassID, 0, 16>(p2);
uint16_t spec_index = GB(p3, 0, 16);
StationID station_to_join = GB(p2, 16, 16);
@@ -2108,7 +2108,7 @@ static CommandCost FindJoiningRoadStop(StationID existing_stop, StationID statio
* bit 3: #Axis of the road for drive-through stops.
* bit 5..10: The roadtype.
* bit 16..31: Station ID to join (NEW_STATION if build new one).
* @param p3 bit 0..7: Roadstop class.
* @param p3 bit 0..15: Roadstop class.
* bit 16..31: Roadstopspec index.
* @param text Unused.
* @return The cost of this operation or an error.
@@ -2127,7 +2127,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32_t p1, u
uint8_t width = (uint8_t)GB(p1, 0, 8);
uint8_t length = (uint8_t)GB(p1, 8, 8);
RoadStopClassID spec_class = Extract<RoadStopClassID, 0, 8>(p3);
RoadStopClassID spec_class = Extract<RoadStopClassID, 0, 16>(p3);
uint16_t spec_index = GB(p3, 16, 16);
/* Check if the given station class is valid */