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

Add road/tram type properties to set road vehicle collision mode

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-02-19 14:29:52 +00:00
parent 39d38ecf19
commit 3497d0dcdb
11 changed files with 108 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf.cpp
View File

@@ -4813,6 +4813,13 @@ static ChangeInfoResult RoadTypeChangeInfo(uint id, int numinfo, int prop, const
rti->extra_flags = (RoadTypeExtraFlags)buf->ReadByte();
break;
case A0RPI_ROADTYPE_COLLISION_MODE: {
if (MappedPropertyLengthMismatch(buf, 1, mapping_entry)) break;
uint8 collision_mode = buf->ReadByte();
if (collision_mode < RTCM_END) rti->collision_mode = (RoadTypeCollisionMode)collision_mode;
break;
}
default:
ret = HandleAction0PropertyDefault(buf, prop);
break;
@@ -4906,6 +4913,10 @@ static ChangeInfoResult RoadTypeReserveInfo(uint id, int numinfo, int prop, cons
buf->Skip(buf->ReadExtendedByte());
break;
case A0RPI_ROADTYPE_COLLISION_MODE:
buf->Skip(buf->ReadExtendedByte());
break;
default:
ret = HandleAction0PropertyDefault(buf, prop);
break;
@@ -11427,6 +11438,7 @@ static void AfterLoadGRFs()
/* Set up custom rail types */
InitRailTypes();
InitRoadTypes();
InitRoadTypesCaches();
for (Engine *e : Engine::IterateType(VEH_ROAD)) {
if (_gted[e->index].rv_max_speed != 0) {