Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix ordering of units in transports by size

Browse source
This commit is contained in:
Tim Felgentreff 2022-04-28 06:40:27 +02:00
parent ef1c09dc23
commit cca28d94a6
1 changed files with 8 additions and 3 deletions

11
src/unit/unit.cpp
View file

@ -1095,13 +1095,18 @@ void CUnit::AddInContainer(CUnit &host)
// keep sorted by size
int mySize = Type->BoardSize;
NextContained = host.UnitInside;
while (NextContained->Type->BoardSize > mySize && NextContained->PrevContained != NextContained) {
NextContained = NextContained->PrevContained;
bool becomeFirst = true;
while (NextContained->Type->BoardSize > mySize) {
becomeFirst = false;
NextContained = NextContained->NextContained;
if (NextContained == host.UnitInside) {
break;
}
}
PrevContained = NextContained->PrevContained;
NextContained->PrevContained->NextContained = this;
NextContained->PrevContained = this;
if (NextContained->Type->BoardSize <= mySize) {
if (becomeFirst) {
host.UnitInside = this;
}
}