games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Practically finished combined artifacts changes, many other fixes.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-01-28 02:11:58 +00:00
parent 092ab5a77f
commit a75a37008f
17 changed files with 419 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CObjectHandler.cpp
View File

@ -836,7 +836,7 @@ void CGHeroInstance::initHero()
mana = manaLimit();
}
void CGHeroInstance::initArmy(CCreatureSet *dst /*= NULL*/)
void CGHeroInstance::initArmy(IArmyDescriptor *dst /*= NULL*/)
{
if(!dst)
dst = this;
@ -883,7 +883,7 @@ void CGHeroInstance::initArmy(CCreatureSet *dst /*= NULL*/)
tlog3 << "Hero " << name << " already has artifact at " << slot << ", ommiting giving " << aid << std::endl;
}
else
dst->putStack(stackNo-warMachinesGiven, new CStackInstance(creID, count));
dst->setCreature(stackNo-warMachinesGiven, creID, count);
}
}
void CGHeroInstance::initHeroDefInfo()