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

[-] Fixed worker freeze bug

Browse source
This commit is contained in:
cybermind 2015-03-14 10:39:52 +05:00
parent c6a31c7a80
commit 979914e20c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/action/action_resource.cpp
View file

@ -895,7 +895,7 @@ int COrder_Resource::StopGathering(CUnit &unit)
// Find and send to resource deposit.
CUnit *depot = FindDeposit(unit, 1000, unit.CurrentResource);
if (!depot || !unit.ResourcesHeld) {
if (!depot || !unit.ResourcesHeld || this->Finished) {
if (!(resinfo.HarvestFromOutside || resinfo.TerrainHarvester)) {
Assert(unit.Container);
DropOutOnSide(unit, LookingW, source);
@ -940,10 +940,6 @@ int COrder_Resource::MoveToDepot(CUnit &unit)
CPlayer &player = *unit.Player;
Assert(&goal);
if (this->Finished) {
return 0; // Could happen when mining near to depot
}
switch (DoActionMove(unit)) { // reached end-point?
case PF_UNREACHABLE:
return -1;

4
src/ui/botpanel.cpp
View file

@ -808,7 +808,9 @@ void CButtonPanel::Draw()
ButtonUnderCursor == i && KeyState != KeyStateInput) {
DrawPopup(buttons[i], UI.ButtonPanel.Buttons[i], UI.ButtonPanel.Buttons[i].X,
UI.ButtonPanel.Buttons[i].Y);
UpdateStatusLineForButton(buttons[i]);
if (!Preference.NoStatusLineTooltips) {
UpdateStatusLineForButton(buttons[i]);
}
}
}
}