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

Redid stack artifacts. Broken save compatibility. Added serializer support for boost::variant and sending CStackInstace* over network by implicitly passing IDs. Moved seeds and checksum to StartInfo. Various minor changes.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2012-04-14 02:20:22 +00:00
parent d55d48b978
commit 722ec55384
31 changed files with 529 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/CObjectHandler.cpp
View File

@ -1473,7 +1473,7 @@ std::string CGHeroInstance::nodeName() const
void CGHeroInstance::putArtifact(ui16 pos, CArtifactInstance *art)
{
assert(!getArt(pos));
art->putAt(this, pos);
art->putAt(ArtifactLocation(this, pos));
}
void CGHeroInstance::putInBackpack(CArtifactInstance *art)
@ -1488,11 +1488,7 @@ bool CGHeroInstance::hasSpellbook() const
void CGHeroInstance::deserializationFix()
{
for(bmap<ui16, ArtSlotInfo>::iterator i = artifactsWorn.begin(); i != artifactsWorn.end(); i++)
if(i->second.artifact && !i->second.locked)
attachTo(i->second.artifact);
//attachTo(&speciality);
artDeserializationFix(this);
}
CBonusSystemNode * CGHeroInstance::whereShouldBeAttached(CGameState *gs)
@ -1535,6 +1531,11 @@ CGHeroInstance::ECanDig CGHeroInstance::diggingStatus() const
}
}
ui8 CGHeroInstance::bearerType() const
{
return ArtBearer::HERO;
}
void CGDwelling::initObj()
{
switch(ID)