TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into console-func-refactor

Browse source 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
This commit is contained in:
Daniel Buckmaster 2014-10-14 14:40:17 +11:00
commit b507dc9555
6487 changed files with 315149 additions and 609761 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/util/settings.cpp
View file

@ -288,7 +288,6 @@ void Settings::readLayer(SimXMLDocument *document, String groupStack)
{
for(S32 i=0; document->pushChildElement(i); i++)
{
bool groupCount = 0;
const UTF8 *type = document->elementValue();
const UTF8 *name = document->attribute("name");
const UTF8 *value = document->getText();
@ -302,7 +301,6 @@ void Settings::readLayer(SimXMLDocument *document, String groupStack)
newStack += name;
readLayer(document, newStack);
groupCount++;
} else if(dStrcmp(type, "Setting") == 0)
{
String nameString = groupStack;
@ -635,13 +633,13 @@ void SettingSaveNode::buildDocument(SimXMLDocument *document, bool skipWrite)
document->addText(mValue);
} else
{
for(int i=0; i<mSettingNodes.size(); i++)
for(S32 i=0; i<mSettingNodes.size(); i++)
{
SettingSaveNode *node = mSettingNodes[i];
node->buildDocument(document);
}
for(int i=0; i<mGroupNodes.size(); i++)
for(S32 i=0; i<mGroupNodes.size(); i++)
{
SettingSaveNode *node = mGroupNodes[i];
node->buildDocument(document);