mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Add XML forwards compatibility to custom level files

Browse source 
Custom level files now have forwards compatibility - except that some
XML objects will simply discard contents and attributes they don't see
fit. For instance, edentities and level properties will not preserve
newer attributes or contents.

This is because preserving them would require having to track the XML
object as part of the edentity internally, because the edentity might
change places or even be deleted throughout the course of editing
someone's level.

I opted to not add support for preserving objects like these, because
frankly, the put-everything-in-one-file level format was and still is a
terrible idea, and we should probably switch to a new format in the
future that isn't single-file. So when that happens, there won't be a
need to preserve XML attributes on edentities.
This commit is contained in:
Misa 2020-09-25 09:31:03 -07:00 committed by Ethan Lee
parent ab446790e8
commit 3f954a169a
1 changed files with 40 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
desktop_version/src/editor.cpp
View file

@ -18,6 +18,7 @@
#include "Music.h" #include "Music.h"
#include "Script.h" #include "Script.h"
#include "UtilityClass.h" #include "UtilityClass.h"
#include "XMLUtils.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
@ -2017,79 +2018,64 @@ bool editorclass::load(std::string& _path)
bool editorclass::save(std::string& _path) bool editorclass::save(std::string& _path)
{ {
tinyxml2::XMLDocument doc; tinyxml2::XMLDocument doc;
bool already_exists = FILESYSTEM_loadTiXml2Document(("levels/" + _path).c_str(), doc);
if (!already_exists)
{
printf("No %s found. Creating new file\n", _path.c_str());
}
tinyxml2::XMLElement* msg; tinyxml2::XMLElement* msg;
tinyxml2::XMLDeclaration* decl = doc.NewDeclaration();
doc.LinkEndChild( decl );
tinyxml2::XMLElement * root = doc.NewElement( "MapData" ); xml::update_declaration(doc);
tinyxml2::XMLElement * root = xml::update_element(doc, "MapData");
root->SetAttribute("version",version); root->SetAttribute("version",version);
doc.LinkEndChild( root );
tinyxml2::XMLComment * comment = doc.NewComment(" Save file " ); xml::update_comment(root, " Save file ");
root->LinkEndChild( comment );
tinyxml2::XMLElement * data = doc.NewElement( "Data" ); tinyxml2::XMLElement * data = xml::update_element(root, "Data");
root->LinkEndChild( data );
msg = doc.NewElement( "MetaData" ); msg = xml::update_element(data, "MetaData");
//getUser //getUser
tinyxml2::XMLElement* meta = doc.NewElement( "Creator" ); xml::update_tag(msg, "Creator", EditorData::GetInstance().creator.c_str());
meta->LinkEndChild( doc.NewText( EditorData::GetInstance().creator.c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "Title" ); xml::update_tag(msg, "Title", EditorData::GetInstance().title.c_str());
meta->LinkEndChild( doc.NewText( EditorData::GetInstance().title.c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "Created" ); xml::update_tag(msg, "Created", version);
meta->LinkEndChild( doc.NewText( help.String(version).c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "Modified" ); xml::update_tag(msg, "Modified", EditorData::GetInstance().modifier.c_str());
meta->LinkEndChild( doc.NewText( EditorData::GetInstance().modifier.c_str() ) );
msg->LinkEndChild( meta );
meta = doc.NewElement( "Modifiers" ); xml::update_tag(msg, "Modifiers", version);
meta->LinkEndChild( doc.NewText( help.String(version).c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "Desc1" ); xml::update_tag(msg, "Desc1", Desc1.c_str());
meta->LinkEndChild( doc.NewText( Desc1.c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "Desc2" ); xml::update_tag(msg, "Desc2", Desc2.c_str());
meta->LinkEndChild( doc.NewText( Desc2.c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "Desc3" ); xml::update_tag(msg, "Desc3", Desc3.c_str());
meta->LinkEndChild( doc.NewText( Desc3.c_str() ));
msg->LinkEndChild( meta );
meta = doc.NewElement( "website" ); xml::update_tag(msg, "website", website.c_str());
meta->LinkEndChild( doc.NewText( website.c_str() ));
msg->LinkEndChild( meta );
if (onewaycol_override) if (onewaycol_override)
{ {
meta = doc.NewElement( "onewaycol_override" ); xml::update_tag(msg, "onewaycol_override", onewaycol_override);
meta->LinkEndChild( doc.NewText( help.String(onewaycol_override).c_str() )); }
msg->LinkEndChild( meta ); else
{
// Delete the element. I could just delete one, but just to be sure,
// I will delete all of them if there are more than one
tinyxml2::XMLElement* element;
while ((element = msg->FirstChildElement("onewaycol_override"))
!= NULL)
{
doc.DeleteNode(element);
}
} }
data->LinkEndChild( msg ); xml::update_tag(data, "mapwidth", mapwidth);
msg = doc.NewElement( "mapwidth" ); xml::update_tag(data, "mapheight", mapheight);
msg->LinkEndChild( doc.NewText( help.String(mapwidth).c_str() ));
data->LinkEndChild( msg );
msg = doc.NewElement( "mapheight" ); xml::update_tag(data, "levmusic", levmusic);
msg->LinkEndChild( doc.NewText( help.String(mapheight).c_str() ));
data->LinkEndChild( msg );
msg = doc.NewElement( "levmusic" );
msg->LinkEndChild( doc.NewText( help.String(levmusic).c_str() ));
data->LinkEndChild( msg );
//New save format //New save format
std::string contentsString=""; std::string contentsString="";
@ -2100,12 +2086,10 @@ bool editorclass::save(std::string& _path)
contentsString += help.String(contents[x + (maxwidth*40*y)]) + ","; contentsString += help.String(contents[x + (maxwidth*40*y)]) + ",";
} }
} }
msg = doc.NewElement( "contents" ); xml::update_tag(data, "contents", contentsString.c_str());
msg->LinkEndChild( doc.NewText( contentsString.c_str() ));
data->LinkEndChild( msg );
msg = doc.NewElement( "edEntities" ); msg = xml::update_element_delete_contents(data, "edEntities");
for(size_t i = 0; i < edentity.size(); i++) for(size_t i = 0; i < edentity.size(); i++)
{ {
tinyxml2::XMLElement *edentityElement = doc.NewElement( "edentity" ); tinyxml2::XMLElement *edentityElement = doc.NewElement( "edentity" );
@ -2122,9 +2106,7 @@ bool editorclass::save(std::string& _path)
msg->LinkEndChild( edentityElement ); msg->LinkEndChild( edentityElement );
} }
data->LinkEndChild( msg ); msg = xml::update_element_delete_contents(data, "levelMetaData");
msg = doc.NewElement( "levelMetaData" );
for(size_t i = 0; i < SDL_arraysize(level); i++) for(size_t i = 0; i < SDL_arraysize(level); i++)
{ {
tinyxml2::XMLElement *edlevelclassElement = doc.NewElement( "edLevelClass" ); tinyxml2::XMLElement *edlevelclassElement = doc.NewElement( "edLevelClass" );
@ -2146,7 +2128,6 @@ bool editorclass::save(std::string& _path)
edlevelclassElement->LinkEndChild( doc.NewText( level[i].roomname.c_str() )) ; edlevelclassElement->LinkEndChild( doc.NewText( level[i].roomname.c_str() )) ;
msg->LinkEndChild( edlevelclassElement ); msg->LinkEndChild( edlevelclassElement );
} }
data->LinkEndChild( msg );
std::string scriptString; std::string scriptString;
for(size_t i = 0; i < script.customscripts.size(); i++) for(size_t i = 0; i < script.customscripts.size(); i++)
@ -2167,9 +2148,7 @@ bool editorclass::save(std::string& _path)
scriptString += "|"; scriptString += "|";
} }
} }
msg = doc.NewElement( "script" ); xml::update_tag(data, "script", scriptString.c_str());
msg->LinkEndChild( doc.NewText( scriptString.c_str() ));
data->LinkEndChild( msg );
return FILESYSTEM_saveTiXml2Document(("levels/" + _path).c_str(), doc); return FILESYSTEM_saveTiXml2Document(("levels/" + _path).c_str(), doc);
} }