games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

Stacks #5: giving creatures, practically finished (many fixes needed).

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-12-12 23:44:16 +00:00
parent fc6d6e02a3
commit 02e4ef507e
10 changed files with 96 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CCreatureSet.h
View File

@ -124,7 +124,7 @@ public:
bool hasStackAtSlot(TSlot slot) const;
bool contains(const CStackInstance *stack) const;
bool canBeMergedWith(const CCreatureSet &cs) const;
bool canBeMergedWith(const CCreatureSet &cs, bool allowMergingStacks = true) const;
template <typename Handler> void serialize(Handler &h, const int version)
{