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

* Changed artifact handling so bonuses from constituent artifacts in combinational ones are added implicitly.

Browse Source 
* Discovered bug when attacking guarded visitables. Needs to wait before battle is over.
This commit is contained in:
OnionKnight
2010-05-09 19:10:59 +00:00
parent adbc142ff0
commit 87e66fff31
9 changed files with 105 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/NetPacksLib.cpp
View File

@ -462,11 +462,8 @@ DLL_EXPORT void SetHeroArtifacts::applyGs( CGameState *gs )
continue;
CArtifact &art = VLC->arth->artifacts[id];
for(std::list<Bonus>::iterator i = art.bonuses.begin(); i != art.bonuses.end(); i++)
{
gained.push_back(&*i);
h->bonuses.push_back(*i);
}
art.addBonusesTo(&h->bonuses);
art.addBonusesTo(&gained);
}
//update hero data
@ -480,19 +477,9 @@ DLL_EXPORT void SetHeroArtifacts::applyGs( CGameState *gs )
if(h->getArtPos(id) >= 0)
continue;
while(1)
{
std::list<Bonus>::iterator hlp = std::find_if(h->bonuses.begin(),h->bonuses.end(),boost::bind(Bonus::IsFrom,_1,Bonus::ARTIFACT,id));
if(hlp != h->bonuses.end())
{
lost.push_back(&*hlp);
h->bonuses.erase(hlp);
}
else
{
break;
}
}
CArtifact &art = VLC->arth->artifacts[id];
art.removeBonusesFrom(&h->bonuses);
art.addBonusesTo(&lost);
}
}