chunk copy incorrect
This commit is contained in:
parent
1c71b8c90c
commit
32c2c3dab8
1 changed files with 2 additions and 7 deletions
|
|
@ -632,6 +632,7 @@ void ztd::chunkdat::set(ztd::chunkdat const& in)
|
||||||
{
|
{
|
||||||
tch->values.insert( std::make_pair(it.first, it.second->pcopy()) );
|
tch->values.insert( std::make_pair(it.first, it.second->pcopy()) );
|
||||||
}
|
}
|
||||||
|
m_achunk=tch;
|
||||||
}
|
}
|
||||||
else if(in.type()==ztd::chunk_abstract::list) //list
|
else if(in.type()==ztd::chunk_abstract::list) //list
|
||||||
{
|
{
|
||||||
|
|
@ -641,6 +642,7 @@ void ztd::chunkdat::set(ztd::chunkdat const& in)
|
||||||
{
|
{
|
||||||
tch->list.push_back(it->pcopy());
|
tch->list.push_back(it->pcopy());
|
||||||
}
|
}
|
||||||
|
m_achunk=tch;
|
||||||
}
|
}
|
||||||
else if(in.type()==ztd::chunk_abstract::string) //string
|
else if(in.type()==ztd::chunk_abstract::string) //string
|
||||||
{
|
{
|
||||||
|
|
@ -649,13 +651,6 @@ void ztd::chunkdat::set(ztd::chunkdat const& in)
|
||||||
tch->val = std::string(cc->val);
|
tch->val = std::string(cc->val);
|
||||||
m_achunk = tch;
|
m_achunk = tch;
|
||||||
}
|
}
|
||||||
else //none
|
|
||||||
{
|
|
||||||
//already cleared: do nothing
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this->set(in.strval(), in.offset(), in.parent());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ztd::chunkdat::addToMap(std::string const& name, chunkdat const& val)
|
void ztd::chunkdat::addToMap(std::string const& name, chunkdat const& val)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue