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

[*] Applied Andrettin's patch (https://bugs.launchpad.net/stratagus/+bug/1429533)

Browse source
This commit is contained in:
cybermind 2015-03-11 00:00:25 +05:00
parent 4382085b4f
commit 757d724302
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/action/action_resource.cpp
View file

@ -766,8 +766,10 @@ int COrder_Resource::GatherResource(CUnit &unit)
// Don't destroy the resource twice.
// This only happens when it's empty.
if (!dead) {
if (Preference.MineNotifications && unit.Player->Index == ThisPlayer->Index) {
unit.Player->Notify(NotifyYellow, source->tilePos, _("%s has collapsed!"), source->Type->Name.c_str());
if (Preference.MineNotifications
&& unit.Player->Index == ThisPlayer->Index
&& source->Variable[GIVERESOURCE_INDEX].Max > DefaultIncomes[this->CurrentResource]) {
unit.Player->Notify(NotifyYellow, source->tilePos, _("%s has collapsed!"), source->Type->Name.c_str());
}
LetUnitDie(*source);
// FIXME: make the workers inside look for a new resource.
@ -839,7 +841,10 @@ int COrder_Resource::StopGathering(CUnit &unit)
this->Resource.Mine = source;
if (Preference.MineNotifications && unit.Player->Index == ThisPlayer->Index
&& source->IsAlive() && !source->MineLow && source->ResourcesHeld * 100 / source->Variable[GIVERESOURCE_INDEX].Max <= 10) {
&& source->IsAlive()
&& !source->MineLow
&& source->ResourcesHeld * 100 / source->Variable[GIVERESOURCE_INDEX].Max <= 10
&& source->Variable[GIVERESOURCE_INDEX].Max > DefaultIncomes[this->CurrentResource]) {
unit.Player->Notify(NotifyYellow, source->tilePos, _("%s is running low!"), source->Type->Name.c_str());
source->MineLow = 1;
}