From c03fdc6c0119c19c91e4e717083e92ebbd542fb6 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 3 Jun 2020 17:34:05 -0700 Subject: [PATCH] Convert Game::customloadquick() to TinyXML2 Ok, who's even reading these commit messages at this point? --- 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 4140debb..ed5bdb17 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -5181,16 +5181,16 @@ void Game::customloadquick(std::string savfile) } std::string levelfile = savfile.substr(7); - TiXmlDocument doc; - if (!FILESYSTEM_loadTiXmlDocument(("saves/"+levelfile+".vvv").c_str(), &doc)) return; + tinyxml2::XMLDocument doc; + if (!FILESYSTEM_loadTiXml2Document(("saves/"+levelfile+".vvv").c_str(), 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) { @@ -5198,10 +5198,10 @@ void Game::customloadquick(std::string savfile) } // 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() ;