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 
(cherry picked from commit 2d73076056)
This commit is contained in:
Michael Lutz
2023-01-22 18:56:36 +01:00
committed by Jonathan G Rennison
parent 3fdf57cbd6
commit 5daaa45e4a
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

@@ -1179,7 +1179,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
@@ -1278,6 +1278,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, mapping_entry, buf);
break;
@@ -1396,7 +1400,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.
@@ -1480,6 +1484,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, mapping_entry, buf);
break;
@@ -1580,7 +1588,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
@@ -1660,6 +1668,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, mapping_entry, buf);
break;
@@ -1756,7 +1768,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
@@ -1822,6 +1834,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, mapping_entry, buf);
break;