1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00

* Fixed bug #112

* Improved the security checks for ExchangeArtifact and SetArtifact, but have also come to realize that SetArtifact  is inherently broken and can be used for cheating. :(
* Preliminary work for combination artifacts, it's now possible to identify artifacts that are combined and what they're made up of.
* Happy New Year!
This commit is contained in:
OnionKnight
2009-12-30 15:33:28 +00:00
parent b79fe389a2
commit ef5b1ca1de
9 changed files with 141 additions and 22 deletions

View File

@ -3696,10 +3696,11 @@ bool CArtPlace::fitsHere(const CArtifact * art)
if(!art)
return true;
// Anything can be placed in the backpack, except War Machines.
if (slotID >= 19 && !CGI->arth->isBigArtifact(art->id)
|| vstd::contains(art->possibleSlots, slotID))
{
// Anything can but War Machines can be placed in backpack.
if (slotID >= 19) {
return !CGI->arth->isBigArtifact(art->id);
} else if (vstd::contains(art->possibleSlots, slotID)) {
// TODO: Deal with combinational at dest and as src.
return true;
}