Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-15 12:04:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes in Settings/g_configs

Browse Source
This commit is contained in:
Eduardo Bart
2012-02-01 22:10:55 -02:00
parent 98ef0e4574
commit 34f9ecb6c8
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/framework/core/configmanager.cpp
View File

@@ -123,6 +123,7 @@ void ConfigManager::addNode(const std::string& key, const OTMLNodePtr& node)
{
OTMLNodePtr clone = node->clone();
node->setTag(key);
node->setUnique(true);
m_confsDoc->addChild(node);
}

32
src/framework/luascript/luavaluecasts.cpp
View File

@@ -243,14 +243,13 @@ void push_otml_subnode_luavalue(const OTMLNodePtr& node)
void push_luavalue(const OTMLNodePtr& node)
{
g_lua.newTable();
int currentIndex = 1;
for(const OTMLNodePtr& cnode : node->children()) {
push_otml_subnode_luavalue(cnode);
if(cnode->isUnique()) {
push_otml_subnode_luavalue(cnode);
if(!g_lua.isNil()) {
g_lua.setField(cnode->tag());
} else
g_lua.pop();
}
g_lua.setField(cnode->tag());
} else
g_lua.rawSeti(currentIndex++);
}
}
@@ -261,15 +260,28 @@ bool luavalue_cast(int index, OTMLNodePtr& node)
if(g_lua.isTable(index)) {
g_lua.pushNil();
while(g_lua.next(index < 0 ? index-1 : index)) {
std::string cnodeName = g_lua.toString(-2);
bool listItem = false;
std::string cnodeName;
if(g_lua.isNumber(-2))
listItem = true;
else
cnodeName = g_lua.toString(-2);
if(g_lua.isTable()) {
OTMLNodePtr cnode;
if(luavalue_cast(-1, cnode)) {
cnode->setTag(cnodeName);
if(listItem)
node->setUnique(false);
else
cnode->setTag(cnodeName);
node->addChild(cnode);
}
} else
node->writeAt(cnodeName, g_lua.toString());
} else {
std::string value = g_lua.toString();
if(listItem)
node->writeIn(value);
else
node->writeAt(cnodeName, value);
}
g_lua.pop();
}
return true;

1
src/framework/otml/otmlnode.h
View File

@@ -147,6 +147,7 @@ void OTMLNode::write(const T& v) {
template<typename T>
void OTMLNode::writeAt(const std::string& childTag, const T& v) {
OTMLNodePtr child = OTMLNode::create(childTag);
child->setUnique(true);
child->write<T>(v);
addChild(child);
}