eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-29 17:27:30 +01:00
Code Issues 154 Wiki Activity

Do not start a shut down engine on a signal; address SonarCloud findings

Browse Source 
A permitting signal no longer wakes a dormant AI: the synthetic departure
command, the shunt-signal ownership tag and the secondary scan that fed
them are gone, and cm_SetVelocity / cm_ShuntVelocity go back to plain
PutCommand with the pre-existing order mask. A secondary now only settles
its own vehicle. Claiming the lead stays for explicit orders.

The rest is SonarCloud cleanup on the branch: if-init statements, merged
and flattened conditionals, split chained assignments, ranges::any_of,
pointer-to-const parameters, std::array for the flag name table and no
more shadowed names.
This commit is contained in:
maj00r
2026-09-14 23:51:20 +02:00
parent a1e4e8d95b
commit e6c2d189ff
5 changed files with 91 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vehicle/DynObj.cpp
View File

@@ -1646,11 +1646,11 @@ void TDynamicObject::ReassignConsistPrimary()
int primarycount = 0;
// walk from the front; Next()/Prev() are not enough, reversed members need the coupler side flipped
int side { end::front };
auto *front { FirstFind( side ) };
if( front == nullptr ) { front = this; }
auto *headvehicle { FirstFind( side ) };
if( headvehicle == nullptr ) { headvehicle = this; }
auto dir { 1 - side };
auto *farend { front };
for( auto *d = front; d != nullptr; d = d->Neighbour( dir ) )
auto *farend { headvehicle };
for( auto *d = headvehicle; d != nullptr; d = d->Neighbour( dir ) )
{
if( d->Mechanik != nullptr )
{
@@ -1664,17 +1664,14 @@ void TDynamicObject::ReassignConsistPrimary()
}
if( drivers.empty() ) { return; }
// a human-driven cab takes priority, so the AI does not take the consist from them
TController *humandriver = nullptr;
for( auto *drv : drivers ) {
if( false == drv->AIControllFlag ) { humandriver = drv; break; }
}
auto const human { std::ranges::find_if(
drivers, []( TController const *drv ) { return false == drv->AIControllFlag; } ) };
// with a single primary it stays; otherwise: the human, the end vehicles, the first on the list
TController *newprimary =
( primarycount == 1 ) ? existingprimary :
( humandriver != nullptr ) ? humandriver :
( front->Mechanik != nullptr ) ? front->Mechanik :
( farend->Mechanik != nullptr ) ? farend->Mechanik :
drivers.front();
TController *newprimary { drivers.front() };
if( primarycount == 1 ) { newprimary = existingprimary; }
else if( human != drivers.end() ) { newprimary = *human; }
else if( headvehicle->Mechanik != nullptr ) { newprimary = headvehicle->Mechanik; }
else if( farend->Mechanik != nullptr ) { newprimary = farend->Mechanik; }
newprimary->ClaimConsistPrimary();
}