From 5a20b4aefc9e3c49c23ed1a428ace7c5fe103670 Mon Sep 17 00:00:00 2001 From: MusicalProgrammer <38636805+MusicalProgrammer@users.noreply.github.com> Date: Tue, 30 Oct 2018 19:19:30 -0400 Subject: [PATCH] Objects now clear on load. --- DataModelInstance.cpp | 6 ++++-- DataModelInstance.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DataModelInstance.cpp b/DataModelInstance.cpp index 979ddfc..183b70b 100644 --- a/DataModelInstance.cpp +++ b/DataModelInstance.cpp @@ -228,11 +228,13 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode) return true; } -bool DataModelInstance::load(const char* filename) +bool DataModelInstance::load(const char* filename, bool clearObjects) { ifstream levelFile(filename,ios::binary); if (levelFile) { + if (clearObjects) + clearLevel(); readXMLFileStream(&levelFile); return true; } @@ -290,7 +292,7 @@ bool DataModelInstance::getOpen() if (file) { _loadedFileName = of.lpstrFile; - load(of.lpstrFile); + load(of.lpstrFile,true); } return true; } diff --git a/DataModelInstance.h b/DataModelInstance.h index 554d2aa..e319274 100644 --- a/DataModelInstance.h +++ b/DataModelInstance.h @@ -15,7 +15,7 @@ public: void clearMessage(); bool debugGetOpen(); bool getOpen(); - bool load(const char* filename); + bool load(const char* filename,bool clearObjects); bool readXMLFileStream(std::ifstream* file); void drawMessage(RenderDevice*); WorkspaceInstance* getWorkspace();