From a845609660efb45a2bc56221b7430ee6d4573cc3 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Sun, 14 Apr 2024 10:23:13 +0200
Subject: [PATCH] actually allow loading v2 and enable in converter

---
 src/fragment_store/convert_frag_to_obj.cpp    | 2 +-
 src/fragment_store/message_fragment_store.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fragment_store/convert_frag_to_obj.cpp b/src/fragment_store/convert_frag_to_obj.cpp
index 7881431..b3cee8c 100644
--- a/src/fragment_store/convert_frag_to_obj.cpp
+++ b/src/fragment_store/convert_frag_to_obj.cpp
@@ -99,7 +99,7 @@ int main(int argc, const char** argv) {
 					// TODO: error handling
 					const auto j = nlohmann::json::parse(tmp_buffer);
 
-					if (false) {
+					if (true) {
 						e.e.replace<ObjComp::MessagesVersion>(uint16_t(2));
 
 						// overwrite og
diff --git a/src/fragment_store/message_fragment_store.cpp b/src/fragment_store/message_fragment_store.cpp
index 7284432..4042b1d 100644
--- a/src/fragment_store/message_fragment_store.cpp
+++ b/src/fragment_store/message_fragment_store.cpp
@@ -607,7 +607,9 @@ float MessageFragmentStore::tick(float) {
 			// missing version, adding
 			fh.emplace<ObjComp::MessagesVersion>();
 		}
-		if (fh.get<ObjComp::MessagesVersion>().v != 1) {
+		const auto object_version = fh.get<ObjComp::MessagesVersion>().v;
+		// TODO: move this early version check somewhere else
+		if (object_version != 1 && object_version != 2) {
 			std::cerr << "MFS: object with version mismatch\n";
 			return 0.05f;
 		}