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

Merge pull request #69 from ArseniyShestakov/artifactsImprovements

Browse Source 
Thanks, looks great now.
This commit is contained in:
DjWarmonger
2014-12-25 20:24:08 +01:00
parent 5271ca156b 04d15174e7
commit 8c471f6359
9 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/CGameHandler.cpp
View File

@@ -522,7 +522,7 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
MoveArtifact ma;
ma.src = ArtifactLocation (finishingBattle->loserHero, artSlot.first);
const CArtifactInstance * art = ma.src.getArt();
if (art && !art->artType->isBig() && art->artType->id != 0) // don't move war machines or locked arts (spellbook)
if (art && !art->artType->isBig() && art->artType->id != ArtifactID::SPELLBOOK) // don't move war machines or locked arts (spellbook)
{
arts.push_back (art->artType->id);
ma.dst = ArtifactLocation (finishingBattle->winnerHero, art->firstAvailableSlot(finishingBattle->winnerHero));
@@ -2971,7 +2971,7 @@ bool CGameHandler::sellArtifact( const IMarket *m, const CGHeroInstance *h, Arti
const CArtifactInstance *art = h->getArtByInstanceId(aid);
if(!art)
COMPLAIN_RET("There is no artifact to sell!");
if(art->artType->id < 7)
if(!art->artType->isTradable())
COMPLAIN_RET("Cannot sell a war machine or spellbook!");
int resVal = 0, dump = 1;