From 677dd424ec9ee00ecfb0f7fdef053537a6be8194 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 3 Jun 2020 17:36:27 -0700 Subject: [PATCH] Convert Game::customsavequick() to TinyXML2 At this point I stopped actually doing a quick test, and just went off of "if it compiles, it works". --- desktop_version/src/Game.cpp | 155 +++++++++++++++++------------------ 1 file changed, 77 insertions(+), 78 deletions(-) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index ed5bdb17..47fed1c4 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -6021,19 +6021,18 @@ void Game::savequick() void Game::customsavequick(std::string savfile) { - TiXmlDocument doc; - TiXmlElement* msg; - TiXmlDeclaration* decl = new TiXmlDeclaration( "1.0", "", "" ); + tinyxml2::XMLDocument doc; + tinyxml2::XMLElement* msg; + tinyxml2::XMLDeclaration* decl = doc.NewDeclaration(); doc.LinkEndChild( decl ); - TiXmlElement * root = new TiXmlElement( "Save" ); + tinyxml2::XMLElement * root = doc.NewElement( "Save" ); doc.LinkEndChild( root ); - TiXmlComment * comment = new TiXmlComment(); - comment->SetValue(" Save file " ); + tinyxml2::XMLComment * comment = doc.NewComment(" Save file " ); root->LinkEndChild( comment ); - TiXmlElement * msgs = new TiXmlElement( "Data" ); + tinyxml2::XMLElement * msgs = doc.NewElement( "Data" ); root->LinkEndChild( msgs ); @@ -6044,8 +6043,8 @@ void Game::customsavequick(std::string savfile) { mapExplored += help.String(map.explored[i]) + ","; } - msg = new TiXmlElement( "worldmap" ); - msg->LinkEndChild( new TiXmlText( mapExplored.c_str() )); + msg = doc.NewElement( "worldmap" ); + msg->LinkEndChild( doc.NewText( mapExplored.c_str() )); msgs->LinkEndChild( msg ); std::string flags; @@ -6053,8 +6052,8 @@ void Game::customsavequick(std::string savfile) { flags += help.String((int) obj.flags[i]) + ","; } - msg = new TiXmlElement( "flags" ); - msg->LinkEndChild( new TiXmlText( flags.c_str() )); + msg = doc.NewElement( "flags" ); + msg->LinkEndChild( doc.NewText( flags.c_str() )); msgs->LinkEndChild( msg ); std::string moods; @@ -6062,8 +6061,8 @@ void Game::customsavequick(std::string savfile) { moods += help.String(obj.customcrewmoods[i]) + ","; } - msg = new TiXmlElement( "moods" ); - msg->LinkEndChild( new TiXmlText( moods.c_str() )); + msg = doc.NewElement( "moods" ); + msg->LinkEndChild( doc.NewText( moods.c_str() )); msgs->LinkEndChild( msg ); std::string crewstatsString; @@ -6071,8 +6070,8 @@ void Game::customsavequick(std::string savfile) { crewstatsString += help.String(crewstats[i]) + ","; } - msg = new TiXmlElement( "crewstats" ); - msg->LinkEndChild( new TiXmlText( crewstatsString.c_str() )); + msg = doc.NewElement( "crewstats" ); + msg->LinkEndChild( doc.NewText( crewstatsString.c_str() )); msgs->LinkEndChild( msg ); std::string collect; @@ -6080,8 +6079,8 @@ void Game::customsavequick(std::string savfile) { collect += help.String((int) obj.collect[i]) + ","; } - msg = new TiXmlElement( "collect" ); - msg->LinkEndChild( new TiXmlText( collect.c_str() )); + msg = doc.NewElement( "collect" ); + msg->LinkEndChild( doc.NewText( collect.c_str() )); msgs->LinkEndChild( msg ); std::string customcollect; @@ -6089,54 +6088,54 @@ void Game::customsavequick(std::string savfile) { customcollect += help.String((int) obj.customcollect[i]) + ","; } - msg = new TiXmlElement( "customcollect" ); - msg->LinkEndChild( new TiXmlText( customcollect.c_str() )); + msg = doc.NewElement( "customcollect" ); + msg->LinkEndChild( doc.NewText( customcollect.c_str() )); msgs->LinkEndChild( msg ); //Position - msg = new TiXmlElement( "finalx" ); - msg->LinkEndChild( new TiXmlText( help.String(map.finalx).c_str() )); + msg = doc.NewElement( "finalx" ); + msg->LinkEndChild( doc.NewText( help.String(map.finalx).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "finaly" ); - msg->LinkEndChild( new TiXmlText( help.String(map.finaly).c_str() )); + msg = doc.NewElement( "finaly" ); + msg->LinkEndChild( doc.NewText( help.String(map.finaly).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "savex" ); - msg->LinkEndChild( new TiXmlText( help.String(savex).c_str() )); + msg = doc.NewElement( "savex" ); + msg->LinkEndChild( doc.NewText( help.String(savex).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "savey" ); - msg->LinkEndChild( new TiXmlText( help.String(savey).c_str() )); + msg = doc.NewElement( "savey" ); + msg->LinkEndChild( doc.NewText( help.String(savey).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "saverx" ); - msg->LinkEndChild( new TiXmlText( help.String(saverx).c_str() )); + msg = doc.NewElement( "saverx" ); + msg->LinkEndChild( doc.NewText( help.String(saverx).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "savery" ); - msg->LinkEndChild( new TiXmlText( help.String(savery).c_str() )); + msg = doc.NewElement( "savery" ); + msg->LinkEndChild( doc.NewText( help.String(savery).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "savegc" ); - msg->LinkEndChild( new TiXmlText( help.String(savegc).c_str() )); + msg = doc.NewElement( "savegc" ); + msg->LinkEndChild( doc.NewText( help.String(savegc).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "savedir" ); - msg->LinkEndChild( new TiXmlText( help.String(savedir).c_str() )); + msg = doc.NewElement( "savedir" ); + msg->LinkEndChild( doc.NewText( help.String(savedir).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "savepoint" ); - msg->LinkEndChild( new TiXmlText( help.String(savepoint).c_str() )); + msg = doc.NewElement( "savepoint" ); + msg->LinkEndChild( doc.NewText( help.String(savepoint).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "trinkets" ); - msg->LinkEndChild( new TiXmlText( help.String(trinkets()).c_str() )); + msg = doc.NewElement( "trinkets" ); + msg->LinkEndChild( doc.NewText( help.String(trinkets()).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "crewmates" ); - msg->LinkEndChild( new TiXmlText( help.String(crewmates()).c_str() )); + msg = doc.NewElement( "crewmates" ); + msg->LinkEndChild( doc.NewText( help.String(crewmates()).c_str() )); msgs->LinkEndChild( msg ); @@ -6144,80 +6143,80 @@ void Game::customsavequick(std::string savfile) if(music.nicefade==1) { - msg = new TiXmlElement( "currentsong" ); - msg->LinkEndChild( new TiXmlText( help.String(music.nicechange).c_str() )); + msg = doc.NewElement( "currentsong" ); + msg->LinkEndChild( doc.NewText( help.String(music.nicechange).c_str() )); msgs->LinkEndChild( msg ); } else { - msg = new TiXmlElement( "currentsong" ); - msg->LinkEndChild( new TiXmlText( help.String(music.currentsong).c_str() )); + msg = doc.NewElement( "currentsong" ); + msg->LinkEndChild( doc.NewText( help.String(music.currentsong).c_str() )); msgs->LinkEndChild( msg ); } - msg = new TiXmlElement( "teleportscript" ); - msg->LinkEndChild( new TiXmlText( teleportscript.c_str() )); + msg = doc.NewElement( "teleportscript" ); + msg->LinkEndChild( doc.NewText( teleportscript.c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "companion" ); - msg->LinkEndChild( new TiXmlText( help.String(companion).c_str() )); + msg = doc.NewElement( "companion" ); + msg->LinkEndChild( doc.NewText( help.String(companion).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "lastsaved" ); - msg->LinkEndChild( new TiXmlText( help.String(lastsaved).c_str() )); + msg = doc.NewElement( "lastsaved" ); + msg->LinkEndChild( doc.NewText( help.String(lastsaved).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "supercrewmate" ); - msg->LinkEndChild( new TiXmlText( BoolToString(supercrewmate) )); + msg = doc.NewElement( "supercrewmate" ); + msg->LinkEndChild( doc.NewText( BoolToString(supercrewmate) )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "scmprogress" ); - msg->LinkEndChild( new TiXmlText( help.String(scmprogress).c_str() )); + msg = doc.NewElement( "scmprogress" ); + msg->LinkEndChild( doc.NewText( help.String(scmprogress).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "scmmoveme" ); - msg->LinkEndChild( new TiXmlText( BoolToString(scmmoveme) )); + msg = doc.NewElement( "scmmoveme" ); + msg->LinkEndChild( doc.NewText( BoolToString(scmmoveme) )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "frames" ); - msg->LinkEndChild( new TiXmlText( help.String(frames).c_str() )); + msg = doc.NewElement( "frames" ); + msg->LinkEndChild( doc.NewText( help.String(frames).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "seconds" ); - msg->LinkEndChild( new TiXmlText( help.String(seconds).c_str() )); + msg = doc.NewElement( "seconds" ); + msg->LinkEndChild( doc.NewText( help.String(seconds).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "minutes" ); - msg->LinkEndChild( new TiXmlText( help.String(minutes).c_str()) ); + msg = doc.NewElement( "minutes" ); + msg->LinkEndChild( doc.NewText( help.String(minutes).c_str()) ); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "hours" ); - msg->LinkEndChild( new TiXmlText( help.String(hours).c_str()) ); + msg = doc.NewElement( "hours" ); + msg->LinkEndChild( doc.NewText( help.String(hours).c_str()) ); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "deathcounts" ); - msg->LinkEndChild( new TiXmlText( help.String(deathcounts).c_str() )); + msg = doc.NewElement( "deathcounts" ); + msg->LinkEndChild( doc.NewText( help.String(deathcounts).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "totalflips" ); - msg->LinkEndChild( new TiXmlText( help.String(totalflips).c_str() )); + msg = doc.NewElement( "totalflips" ); + msg->LinkEndChild( doc.NewText( help.String(totalflips).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "hardestroom" ); - msg->LinkEndChild( new TiXmlText( hardestroom.c_str() )); + msg = doc.NewElement( "hardestroom" ); + msg->LinkEndChild( doc.NewText( hardestroom.c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "hardestroomdeaths" ); - msg->LinkEndChild( new TiXmlText( help.String(hardestroomdeaths).c_str() )); + msg = doc.NewElement( "hardestroomdeaths" ); + msg->LinkEndChild( doc.NewText( help.String(hardestroomdeaths).c_str() )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "showminimap" ); - msg->LinkEndChild( new TiXmlText( BoolToString(map.customshowmm) )); + msg = doc.NewElement( "showminimap" ); + msg->LinkEndChild( doc.NewText( BoolToString(map.customshowmm) )); msgs->LinkEndChild( msg ); - msg = new TiXmlElement( "summary" ); + msg = doc.NewElement( "summary" ); std::string summary = savearea + ", " + timestring(); - msg->LinkEndChild( new TiXmlText( summary.c_str() )); + msg->LinkEndChild( doc.NewText( summary.c_str() )); msgs->LinkEndChild( msg ); customquicksummary = summary; std::string levelfile = savfile.substr(7); - if(FILESYSTEM_saveTiXmlDocument(("saves/"+levelfile+".vvv").c_str(), &doc)) + if(FILESYSTEM_saveTiXml2Document(("saves/"+levelfile+".vvv").c_str(), doc)) { printf("Game saved\n"); }