games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Revert "Merge pull request #124 from vcmi/issue/1372"

Browse Source 
This reverts commit da01af319b, reversing
changes made to 8b6b4e2e0b.
This commit is contained in:
AlexVinS
2015-11-07 11:35:02 +03:00
parent bd12989ad6
commit e645b46aed
6 changed files with 31 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/CGameHandler.h
View File

@@ -71,16 +71,13 @@ public:
struct CasualtiesAfterBattle
{
typedef std::pair<StackLocation, int> TStackAndItsNewCount;
typedef std::map<CreatureID, TQuantity> TSummoned;
enum {ERASE = -1};
const CArmedInstance * army;
std::vector<TStackAndItsNewCount> newStackCounts;
std::vector<ArtifactLocation> removedWarMachines;
TSummoned summoned;
ObjectInstanceID heroWithDeadCommander; //TODO: unify stack locations
ObjectInstanceID heroWithDeadCommander; //TODO: unify stack loactions
CasualtiesAfterBattle(const CArmedInstance * _army, BattleInfo *bat);
void updateArmy(CGameHandler *gh);
CasualtiesAfterBattle(const CArmedInstance *army, BattleInfo *bat);
void takeFromArmy(CGameHandler *gh);
};
class CGameHandler : public IGameCallback, CBattleInfoCallback