games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Minor fix.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-05-31 23:26:46 +00:00
parent 39eb87924e
commit 068350a781
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hch/CArtHandler.cpp
View File

@@ -216,9 +216,13 @@ void CArtHandler::loadArtifacts(bool onlyTxt)
if(desc[0] == '\"' && desc[desc.size()-1] == '\"') if(desc[0] == '\"' && desc[desc.size()-1] == '\"')
desc = desc.substr(1,desc.size()-2); desc = desc.substr(1,desc.size()-2);
if(onlyTxt)
continue;
// Fill in information about combined artifacts. Should perhaps be moved to a config file? // Fill in information about combined artifacts. Should perhaps be moved to a config file?
nart.constituentOf = NULL; nart.constituentOf = NULL;
switch (nart.id) { switch (nart.id)
{
case 129: // Angelic Alliance case 129: // Angelic Alliance
nart.constituents = new std::vector<ui32>(); nart.constituents = new std::vector<ui32>();
*nart.constituents += 31, 32, 33, 34, 35, 36; *nart.constituents += 31, 32, 33, 34, 35, 36;
@@ -286,12 +290,13 @@ void CArtHandler::loadArtifacts(bool onlyTxt)
break; break;
} }
if(!onlyTxt) artifacts.push_back(nart);
artifacts.push_back(nart);
} }
sortArts(); sortArts();
if(!onlyTxt) if(onlyTxt)
addBonuses(); return;
addBonuses();
// Populate reverse mappings of combinational artifacts. // Populate reverse mappings of combinational artifacts.
BOOST_FOREACH(CArtifact artifact, artifacts) { BOOST_FOREACH(CArtifact artifact, artifacts) {