Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Refactor|libdoomsday|DED: Updated Episode, MapInfo, Sky definition co…
…pying
  • Loading branch information
danij-deng committed Aug 1, 2014
1 parent ce3c0e7 commit 0592ee1
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions doomsday/libdoomsday/src/defs/dedparser.cpp
Expand Up @@ -968,10 +968,8 @@ DENG2_PIMPL(DEDParser)

if(prevEpisodeDefIdx >= 0 && bCopyNext)
{
Record *prevEpisode = &ded->episodes[prevEpisodeDefIdx];
// Private members are used for metadata (like __order__) that should
// not be copied.
epsd->assign(*prevEpisode, Record::IgnoreDoubleUnderscoreMembers);
//Record *prevEpisode = &ded->episodes[prevEpisodeDefIdx];
ded->episodes.copy(prevEpisodeDefIdx, *epsd);
}

FINDBEGIN;
Expand Down Expand Up @@ -1633,20 +1631,16 @@ DENG2_PIMPL(DEDParser)

if(ISTOKEN("Sky"))
{
Record *prevSky = 0;
int model = 0;

// New skies are appended to the end of the list.
idx = ded->addSky();
Record &sky = ded->skies[idx];

if(prevSkyDefIdx >= 0)
if(prevSkyDefIdx >= 0 && bCopyNext)
{
prevSky = &ded->skies[prevSkyDefIdx];

// Private members are used for metadata (like __order__) that should
// not be copied.
if(bCopyNext) sky.assign(*prevSky, Record::IgnoreDoubleUnderscoreMembers);
//Record *prevSky = &ded->skies[prevSkyDefIdx];
ded->skies.copy(prevSkyDefIdx, sky);
}

FINDBEGIN;
Expand Down Expand Up @@ -1771,10 +1765,8 @@ DENG2_PIMPL(DEDParser)

if(prevMapInfoDefIdx >= 0 && bCopyNext)
{
Record *prevMapInfo = &ded->mapInfos[prevMapInfoDefIdx];
// Private members are used for metadata (like __order__) that should
// not be copied.
mi->assign(*prevMapInfo, Record::IgnoreDoubleUnderscoreMembers);
// Record *prevMapInfo = &ded->mapInfos[prevMapInfoDefIdx];
ded->mapInfos.copy(prevMapInfoDefIdx, *mi);
}

Record &sky = mi->subrecord("sky");
Expand Down

0 comments on commit 0592ee1

Please sign in to comment.