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

Little more work on artifacts.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-12-29 21:04:22 +00:00
parent 8104a43809
commit c9189119b9
17 changed files with 425 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/NetPacksServer.cpp
View File

@@ -112,7 +112,7 @@ bool GarrisonHeroSwap::applyGh( CGameHandler *gh )
bool ExchangeArtifacts::applyGh( CGameHandler *gh )
{
ERROR_IF_NOT_OWNS(hid1);//second hero can be ally
return gh->swapArtifacts(hid1,hid2,slot1,slot2);
return gh->moveArtifact(hid1,hid2,slot1,slot2);
}
bool AssembleArtifacts::applyGh( CGameHandler *gh )
@@ -170,7 +170,7 @@ bool TradeOnMarketplace::applyGh( CGameHandler *gh )
case CREATURE_EXP:
return gh->sacrificeCreatures(m, hero, r1, val);
case ARTIFACT_EXP:
return gh->sacrificeArtifact(m, hero, hero->getArtAtPos(r1));
return gh->sacrificeArtifact(m, hero, r1);
default:
COMPLAIN_AND_RETURN("Unknown exchange mode!");
}