Fail file opening when the engine or the file version is greater than the current one.

Author: kovacsv

Sources/NodeUIEngine/NUIE_NodeEditor.cpp

@@ -9,8 +9,7 @@
 namespace NUIE
 {
 
-static const std::string	NodeEditorFileMarker = "NodeEditorFile";
-static const int			NodeEditorFileVersion = 1;
+static const std::string NodeEditorFileMarker = "NodeEditorFile";
 
 static bool GetBoundingRect (const NodeUIManager& uiManager, NodeUIDrawingEnvironment& env, Rect& boundingRect)
 {
@@ -232,25 +231,28 @@ bool NodeEditor::Open (const std::string& fileName, const ExternalHeaderIO* exte
 bool NodeEditor::Open (NE::InputStream& inputStream, const ExternalHeaderIO* externalHeader)
 {
 	if (externalHeader != nullptr) {
-		if (DBGERROR (!externalHeader->Read (inputStream))) {
+		if (!externalHeader->Read (inputStream)) {
 			return false;
 		}
 	}
 
 	std::string fileMarker;
 	inputStream.Read (fileMarker);
-	if (DBGERROR (fileMarker != NodeEditorFileMarker)) {
+	if (fileMarker != NodeEditorFileMarker) {
 		return false;
 	}
 
-	int fileVersion = 0;
-	inputStream.Read (fileVersion);
-	if (DBGERROR (fileVersion != NodeEditorFileVersion)) {
+	int readFileVersion = 0;
+	inputStream.Read (readFileVersion);
+	if (readFileVersion > FileVersion) {
 		return false;
 	}
 
 	Version readVersion;
 	readVersion.Read (inputStream);
+	if (readVersion > EngineVersion) {
+		return false;
+	}
 
 	if (DBGERROR (!uiManager.Open (inputStream))) {
 		return false;
@@ -287,8 +289,8 @@ bool NodeEditor::Save (NE::OutputStream& outputStream, const ExternalHeaderIO* e
 	}
 
 	outputStream.Write (NodeEditorFileMarker);
-	outputStream.Write (NodeEditorFileVersion);
-	currentVersion.Write (outputStream);
+	outputStream.Write (FileVersion);
+	EngineVersion.Write (outputStream);
 	if (DBGERROR (!uiManager.Save (outputStream))) {
 		return false;
 	}

Sources/NodeUIEngine/NUIE_Version.cpp

@@ -20,6 +20,34 @@ Version::Version (int version1, int version2, int version3) :
 
 }
 
+bool Version::operator< (const Version& rhs) const
+{
+	if (version1 < rhs.version1) {
+		return true;
+	}
+	if (version2 < rhs.version2) {
+		return true;
+	}
+	if (version3 < rhs.version3) {
+		return true;
+	}
+	return false;
+}
+
+bool Version::operator> (const Version& rhs) const
+{
+	if (version1 > rhs.version1) {
+		return true;
+	}
+	if (version2 > rhs.version2) {
+		return true;
+	}
+	if (version3 > rhs.version3) {
+		return true;
+	}
+	return false;
+}
+
 NE::Stream::Status Version::Read (NE::InputStream& inputStream)
 {
 	inputStream.Read (version1);
@@ -36,6 +64,7 @@ NE::Stream::Status Version::Write (NE::OutputStream& outputStream) const
 	return outputStream.GetStatus ();
 }
 
-const Version currentVersion (VSE_VERSION_1, VSE_VERSION_2, VSE_VERSION_3);
+const Version EngineVersion (VSE_VERSION_1, VSE_VERSION_2, VSE_VERSION_3);
+const int FileVersion = 1;
 
 }

Sources/NodeUIEngine/NUIE_Version.hpp

@@ -12,6 +12,9 @@ class Version
 	Version ();
 	Version (int version1, int version2, int version3);
 
+	bool				operator< (const Version& rhs) const;
+	bool				operator> (const Version& rhs) const;
+
 	NE::Stream::Status	Read (NE::InputStream& inputStream);
 	NE::Stream::Status	Write (NE::OutputStream& outputStream) const;
 
@@ -21,7 +24,8 @@ class Version
 	int version3;
 };
 
-extern const Version currentVersion;
+extern const Version EngineVersion;
+extern const int FileVersion;
 
 }