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

Add: [NewGRF] Second vehicle property for additional callback flags.

Browse Source
This commit is contained in:
Michael Lutz
2023-01-22 18:56:36 +01:00
parent f5394ed2ef
commit 2d73076056
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/newgrf.cpp
View File

@@ -1237,7 +1237,7 @@ static ChangeInfoResult RailVehicleChangeInfo(uint engine, int numinfo, int prop
}
case 0x1E: // Callback
ei->callback_mask = buf->ReadByte();
SB(ei->callback_mask, 0, 8, buf->ReadByte());
break;
case PROP_TRAIN_TRACTIVE_EFFORT: // 0x1F Tractive effort coefficient
@@ -1336,6 +1336,10 @@ static ChangeInfoResult RailVehicleChangeInfo(uint engine, int numinfo, int prop
ei->extra_flags = static_cast<ExtraEngineFlags>(buf->ReadDWord());
break;
case 0x31: // Callback additional mask
SB(ei->callback_mask, 8, 8, buf->ReadByte());
break;
default:
ret = CommonVehicleChangeInfo(ei, prop, buf);
break;
@@ -1454,7 +1458,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint engine, int numinfo, int prop
}
case 0x17: // Callback mask
ei->callback_mask = buf->ReadByte();
SB(ei->callback_mask, 0, 8, buf->ReadByte());
break;
case PROP_ROADVEH_TRACTIVE_EFFORT: // Tractive effort coefficient in 1/256.
@@ -1538,6 +1542,10 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint engine, int numinfo, int prop
ei->extra_flags = static_cast<ExtraEngineFlags>(buf->ReadDWord());
break;
case 0x28: // Callback additional mask
SB(ei->callback_mask, 8, 8, buf->ReadByte());
break;
default:
ret = CommonVehicleChangeInfo(ei, prop, buf);
break;
@@ -1638,7 +1646,7 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint engine, int numinfo, int prop
}
case 0x12: // Callback mask
ei->callback_mask = buf->ReadByte();
SB(ei->callback_mask, 0, 8, buf->ReadByte());
break;
case 0x13: // Refit cost
@@ -1718,6 +1726,10 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint engine, int numinfo, int prop
ei->extra_flags = static_cast<ExtraEngineFlags>(buf->ReadDWord());
break;
case 0x22: // Callback additional mask
SB(ei->callback_mask, 8, 8, buf->ReadByte());
break;
default:
ret = CommonVehicleChangeInfo(ei, prop, buf);
break;
@@ -1814,7 +1826,7 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint engine, int numinfo, int
}
case 0x14: // Callback mask
ei->callback_mask = buf->ReadByte();
SB(ei->callback_mask, 0, 8, buf->ReadByte());
break;
case 0x15: // Refit cost
@@ -1880,6 +1892,10 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint engine, int numinfo, int
ei->extra_flags = static_cast<ExtraEngineFlags>(buf->ReadDWord());
break;
case 0x22: // Callback additional mask
SB(ei->callback_mask, 8, 8, buf->ReadByte());
break;
default:
ret = CommonVehicleChangeInfo(ei, prop, buf);
break;