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

[-] Transporter bug patch from Andrettin

Browse source
This commit is contained in:
android@localhost 2015-03-17 10:25:19 +05:00
parent 0fdb44054b
commit d07a22df0f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ui/mouse.cpp
View file

@ -1755,14 +1755,22 @@ static void UIHandleButtonDown_OnButton(unsigned button)
if (!GameObserve && !GamePaused && !GameEstablishing && ThisPlayer->IsTeamed(*Selected[0])) {
if (Selected[0]->BoardCount >= ButtonUnderCursor) {
CUnit *uins = Selected[0]->UnitInside;
for (int i = ButtonUnderCursor; i; uins = uins->NextContained) {
if (uins->Boarded) {
--i;
size_t j = 0;
for (int i = 0; i < Selected[0]->InsideCount; ++i, uins = uins->NextContained) {
if (!uins->Boarded || j >= UI.TransportingButtons.size() || (Selected[0]->Player != ThisPlayer && uins->Player != ThisPlayer)) {
continue;
}
if (ButtonAreaUnderCursor == ButtonAreaTransporting
&& static_cast<size_t>(ButtonUnderCursor) == j) {
Assert(uins->Boarded);
const int flush = !(KeyModifiers & ModifierShift);
if (ThisPlayer->IsTeamed(*Selected[0]) || uins->Player == ThisPlayer) {
SendCommandUnload(*Selected[0], Selected[0]->tilePos, uins, flush);
}
}
++j;
}
Assert(uins->Boarded);
const int flush = !(KeyModifiers & ModifierShift);
SendCommandUnload(*Selected[0], Selected[0]->tilePos, uins, flush);
}
}
} else if (ButtonAreaUnderCursor == ButtonAreaButton) {