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

[-] Fixed bug when player loses resources if he stops resource-using action (upgrade-to, research etc)

Browse source
This commit is contained in:
cybermind 2013-05-12 14:27:20 +06:00
parent e0542ff0e1
commit 92d8da8469
1 changed files with 16 additions and 2 deletions

18
src/action/command.cpp
View file

@ -36,7 +36,10 @@
#include "stratagus.h"
#include "actions.h"
#include "action/action_built.h"
#include "action/action_research.h"
#include "action/action_train.h"
#include "action/action_upgradeto.h"
#include "commands.h"
#include "map.h"
#include "pathfinder.h"
@ -63,8 +66,19 @@ static void ReleaseOrders(CUnit &unit)
Assert(unit.Orders.empty() == false);
// Order 0 must be stopped in the action loop.
for (size_t i = 1; i != unit.Orders.size(); ++i) {
delete unit.Orders[i];
for (size_t i = 0; i != unit.Orders.size(); ++i) {
if (unit.Orders[i]->Action == UnitActionBuilt) {
(dynamic_cast<COrder_Built *>(unit.Orders[i]))->Cancel(unit);
} else if (unit.Orders[i]->Action == UnitActionResearch) {
(dynamic_cast<COrder_Research *>(unit.Orders[i]))->Cancel(unit);
} else if (unit.Orders[i]->Action == UnitActionTrain) {
(dynamic_cast<COrder_Train *>(unit.Orders[i]))->Cancel(unit);
} else if (unit.Orders[i]->Action == UnitActionUpgradeTo) {
(dynamic_cast<COrder_UpgradeTo *>(unit.Orders[i]))->Cancel(unit);
}
if (i > 0) {
delete unit.Orders[i];
}
}
unit.Orders.resize(1);
unit.Orders[0]->Finished = true;