1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00

- moved all system-specific handling of filesystem to VCMIDirs.cpp (new file)

- fixed #1128, artifact constituents are now stored as pointers
This commit is contained in:
Ivan Savenko
2013-03-02 18:41:25 +00:00
parent f306d7bb70
commit b5fcefe455
14 changed files with 173 additions and 142 deletions

View File

@ -829,9 +829,9 @@ DLL_LINKAGE void AssembledArtifact::applyGs( CGameState *gs )
CCombinedArtifactInstance *combinedArt = new CCombinedArtifactInstance(builtArt);
gs->map->addNewArtifactInstance(combinedArt);
//retrieve all constituents
BOOST_FOREACH(si32 constituentID, *builtArt->constituents)
BOOST_FOREACH(const CArtifact * constituent, *builtArt->constituents)
{
ArtifactPosition pos = artSet->getArtPos(constituentID);
ArtifactPosition pos = artSet->getArtPos(constituent->id);
assert(pos >= 0);
CArtifactInstance *constituentInstance = artSet->getArt(pos);