From 3419f9fa156829ec6baf7619ebd93d8e996542bc Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 3 Jun 2020 17:24:31 -0700 Subject: [PATCH] Convert Game::loadquick() to TinyXML2 Same changes as all other XML-loading functions. --- desktop_version/src/Game.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 6e35cd2d..125e6bd4 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -4954,16 +4954,16 @@ void Game::starttrial( int t ) void Game::loadquick() { - TiXmlDocument doc; - if (!FILESYSTEM_loadTiXmlDocument("saves/qsave.vvv", &doc)) return; + tinyxml2::XMLDocument doc; + if (!FILESYSTEM_loadTiXml2Document("saves/qsave.vvv", doc)) return; - TiXmlHandle hDoc(&doc); - TiXmlElement* pElem; - TiXmlHandle hRoot(0); + tinyxml2::XMLHandle hDoc(&doc); + tinyxml2::XMLElement* pElem; + tinyxml2::XMLHandle hRoot(NULL); { - pElem=hDoc.FirstChildElement().Element(); + pElem=hDoc.FirstChildElement().ToElement(); // should always have a valid root but handle gracefully if it does if (!pElem) { @@ -4971,10 +4971,10 @@ void Game::loadquick() } // save this for later - hRoot=TiXmlHandle(pElem); + hRoot=tinyxml2::XMLHandle(pElem); } - for( pElem = hRoot.FirstChild( "Data" ).FirstChild().Element(); pElem; pElem=pElem->NextSiblingElement()) + for( pElem = hRoot.FirstChildElement( "Data" ).FirstChild().ToElement(); pElem; pElem=pElem->NextSiblingElement()) { std::string pKey(pElem->Value()); const char* pText = pElem->GetText() ;