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

* campaign against magic numbers

Browse Source 
* ArtifactID was misleading and wrongly used in one place -- renamed and fixed
* minor changes
This commit is contained in:
mateuszb
2012-09-23 18:01:04 +00:00
parent 3fcba4fb5c
commit 6a81c8b1af
32 changed files with 567 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/NetPacks.h
View File

@@ -546,7 +546,7 @@ struct SetCommanderProperty : public CPackForClient //120
StackLocation sl; //for commander not on the hero?
ui8 which; // use ECommanderProperty
expType amount; //0 for dead, >0 for alive
TExpType amount; //0 for dead, >0 for alive
si32 additionalInfo; //for secondary skills choice
Bonus accumulatedBonus;
@@ -1322,8 +1322,8 @@ struct BattleResult : public CPackForClient//3003
ui8 result; //EResult values
ui8 winner; //0 - attacker, 1 - defender, [2 - draw (should be possible?)]
std::map<ui32,si32> casualties[2]; //first => casualties of attackers - map crid => number
expType exp[2]; //exp for attacker and defender
std::set<ui32> artifacts; //artifacts taken from loser to winner - currently unused
TExpType exp[2]; //exp for attacker and defender
std::set<TArtifactID> artifacts; //artifacts taken from loser to winner - currently unused
template <typename Handler> void serialize(Handler &h, const int version)
{