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

Support railtype-dependant GRF train speed limits with realistic braking

Browse Source 
See: #389
This commit is contained in:
Jonathan G Rennison
2022-05-24 21:50:38 +01:00
parent aeac77e012
commit 502980ba61
7 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/newgrf_spritegroup.cpp
View File

@@ -354,6 +354,7 @@ void DeterministicSpriteGroup::AnalyseCallbacks(AnalyseCallbackOperation &op) co
cb36_op.mode = ACOM_CB36_PROP;
range.group->AnalyseCallbacks(cb36_op);
op.properties_used |= cb36_op.properties_used;
op.callbacks_used |= cb36_op.callbacks_used;
}
break;
}
@@ -370,7 +371,18 @@ void DeterministicSpriteGroup::AnalyseCallbacks(AnalyseCallbackOperation &op) co
for (const auto &range : this->ranges) {
if (range.low == range.high) {
if (range.low < 64) {
if (find_cb_result()) SetBit(op.properties_used, range.low);
if (find_cb_result()) {
SetBit(op.properties_used, range.low);
if (range.low == 0x9) {
/* Speed */
if (range.group != nullptr) {
AnalyseCallbackOperation cb36_speed;
cb36_speed.mode = ACOM_CB36_SPEED;
range.group->AnalyseCallbacks(cb36_speed);
op.callbacks_used |= cb36_speed.callbacks_used;
}
}
}
}
} else {
if (range.group != nullptr) range.group->AnalyseCallbacks(op);
@@ -392,6 +404,10 @@ void DeterministicSpriteGroup::AnalyseCallbacks(AnalyseCallbackOperation &op) co
return;
}
}
if (op.mode == ACOM_CB36_SPEED && adjust.variable == 0x4A) {
op.callbacks_used |= SGCU_CB36_SPEED_RAILTYPE;
return;
}
}
for (const auto &adjust : this->adjusts) {
if (op.mode == ACOM_CB_VAR && adjust.variable == 0xC) {