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

Stacks #4 -> giving creatures still needs to be fixed.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-12-05 23:10:02 +00:00
parent fdb541d81e
commit 848a00bc6f
23 changed files with 492 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/CCreatureSet.cpp
View File

@@ -295,6 +295,11 @@ CCreatureSet::CCreatureSet()
formation = false;
}
CCreatureSet::CCreatureSet(const CCreatureSet&)
{
assert(0);
}
CCreatureSet::~CCreatureSet()
{
clear();
@@ -322,7 +327,11 @@ CStackInstance * CCreatureSet::detachStack(TSlot slot)
CStackInstance *ret = slots[slot];
if(CArmedInstance *armedObj = castToArmyObj())
ret->detachFrom(armedObj);
{
ret->setArmyObj(NULL); //detaches from current armyobj
}
assert(!ret->armyObj); //we failed detaching?
slots.erase(slot);
return ret;
@@ -353,6 +362,12 @@ bool CCreatureSet::hasStackAtSlot(TSlot slot) const
return vstd::contains(slots, slot);
}
CCreatureSet & CCreatureSet::operator=(const CCreatureSet&cs)
{
assert(0);
return cs;
}
CStackInstance::CStackInstance()
: armyObj(_armyObj)
{
@@ -410,10 +425,9 @@ void CStackInstance::setArmyObj(const CArmedInstance *ArmyObj)
if(_armyObj)
detachFrom(const_cast<CArmedInstance*>(_armyObj));
_armyObj = ArmyObj;
if(ArmyObj)
{
_armyObj = ArmyObj;
attachTo(const_cast<CArmedInstance*>(_armyObj));
}
}
@@ -446,6 +460,11 @@ bool CStackInstance::valid(bool allowUnrandomized) const
return allowUnrandomized;
}
CStackInstance::~CStackInstance()
{
}
CStackBasicDescriptor::CStackBasicDescriptor()
{
type = NULL;
@@ -457,6 +476,11 @@ CStackBasicDescriptor::CStackBasicDescriptor(TCreature id, TQuantity Count)
{
}
CStackBasicDescriptor::CStackBasicDescriptor(const CCreature *c, TQuantity Count)
: type(c), count(Count)
{
}
DLL_EXPORT std::ostream & operator<<(std::ostream & str, const CStackInstance & sth)
{
if(!sth.valid(true))