games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Fixed logic regression from previous commit.

Browse Source
This commit is contained in:
DjWarmonger 2015-09-23 21:38:16 +02:00
parent 971f6d1c1f
commit 6b45f323ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CArtHandler.cpp
View File

@ -577,9 +577,9 @@ bool CArtHandler::legalArtifact(ArtifactID id)
{ {
auto art = artifacts[id]; auto art = artifacts[id];
//assert ( (!art->constituents) || art->constituents->size() ); //artifacts is not combined or has some components //assert ( (!art->constituents) || art->constituents->size() ); //artifacts is not combined or has some components
return (art->possibleSlots[ArtBearer::HERO].size() || return ((art->possibleSlots[ArtBearer::HERO].size() ||
(art->possibleSlots[ArtBearer::COMMANDER].size() && VLC->modh->modules.COMMANDERS) || (art->possibleSlots[ArtBearer::COMMANDER].size() && VLC->modh->modules.COMMANDERS) ||
(art->possibleSlots[ArtBearer::CREATURE].size() && VLC->modh->modules.STACK_ARTIFACT) && (art->possibleSlots[ArtBearer::CREATURE].size() && VLC->modh->modules.STACK_ARTIFACT)) &&
!(art->constituents) && //no combo artifacts spawning !(art->constituents) && //no combo artifacts spawning
art->aClass >= CArtifact::ART_TREASURE && art->aClass >= CArtifact::ART_TREASURE &&
art->aClass <= CArtifact::ART_RELIC); art->aClass <= CArtifact::ART_RELIC);

4
lib/rmg/CMapGenerator.cpp
View File

@ -93,8 +93,8 @@ void CMapGenerator::initQuestArtsRemaining()
{ {
for (auto art : VLC->arth->artifacts) for (auto art : VLC->arth->artifacts)
{ {
if (art->aClass == CArtifact::ART_TREASURE && art->constituentOf.empty()) //don't use parts of combined artifacts if (art->aClass == CArtifact::ART_TREASURE && VLC->arth->legalArtifact(art->id) && art->constituentOf.empty()) //don't use parts of combined artifacts
questArtifacts.push_back(art->id); questArtifacts.push_back(art->id);
} }
} }