bug fixes

vns-cpp/content.cpp

@@ -11,7 +11,8 @@ Content::Content(const std::unordered_map<std::string, ContentValueType>& data,
 	narrator = cast<std::string>(data, "narrator", "");
 	previous = cast<std::string>(data, "previous", "");
 	next = ContentNext(
-		cast<std::unordered_map<std::string, ContentNextValueType>>(data, "next", {{"type", "null"}, {"target", ""}}));
+		cast<std::unordered_map<
+			std::string, ContentNextValueType>>(data, "next", {{"type", "default"}, {"target", ""}}));
 	comments = cast<std::vector<std::string>>(data, "comments", {});
 }
 

vns-cpp/contentNext.cpp

@@ -23,9 +23,14 @@ nlohmann::json ContentNext::to_json() const
 	return json_data;
 }
 
+bool ContentNext::has_single_target() const
+{
+	return std::holds_alternative<std::string>(target_);
+}
+
 bool ContentNext::has_multi_targets() const
 {
-	return !std::holds_alternative<std::string>(target_);
+	return !has_single_target();
 }
 
 std::string ContentNext::get_type() const
@@ -47,13 +52,5 @@ MultiTargetsType ContentNext::get_targets() const
 
 bool ContentNext::is_null() const
 {
-	if (type_.empty() || type_ == "null")
-	{
-		return true;
-	}
-	if (std::holds_alternative<std::string>(target_))
-	{
-		return std::get<std::string>(target_).empty();
-	}
-	return std::get<MultiTargetsType>(target_).empty();
+	return has_single_target() ? get_target().empty() : get_targets().empty();
 }

vns-cpp/contentNext.h

@@ -21,18 +21,19 @@ class ContentNext
 	}
 
 	ContentNext(const std::unordered_map<std::string, ContentNextValueType>& data) : ContentNext(
-		std::get<std::string>(data.contains("type") ? data.at("type") : "null"),
+		std::get<std::string>(data.contains("type") ? data.at("type") : "default"),
 		data.contains("target") ? data.at("target") : "")
 	{
 	}
 
-	ContentNext() : ContentNext("null", "")
+	ContentNext() : ContentNext("default", "")
 	{
 	}
 
 	[[nodiscard]] std::string get_type() const;
 	[[nodiscard]] std::string get_target() const;
 	[[nodiscard]] MultiTargetsType get_targets() const;
+	[[nodiscard]] bool has_single_target() const;
 	[[nodiscard]] bool has_multi_targets() const;
 	[[nodiscard]] bool is_null() const;
 	[[nodiscard]] std::unordered_map<std::string, ContentNextValueType> to_map() const;

vns-cpp/naming.cpp

@@ -38,6 +38,24 @@ std::unordered_set<std::string> Naming::GetTags() const
 	return tags_;
 }
 
+// If contains a tag
+bool Naming::ContainsTag(const std::string& tag) const
+{
+	return tags_.contains(tag);
+}
+
+// Insert a tag
+void Naming::InsertTag(const std::string& tag)
+{
+	tags_.insert(tag);
+}
+
+// Erase a tag
+void Naming::EraseTag(const std::string& tag)
+{
+	tags_.erase(tag);
+}
+
 // Check if two Naming objects or a Naming object and a string refer to the same character
 bool Naming::Equal(const std::variant<Naming, std::string>& o, const bool must_be_the_same) const
 {

vns-cpp/naming.h

@@ -18,6 +18,9 @@ class Naming
 	[[nodiscard]] std::string ToString() const;
 	[[nodiscard]] std::string GetName() const;
 	[[nodiscard]] std::unordered_set<std::string> GetTags() const;
+	[[nodiscard]] bool ContainsTag(const std::string&) const;
+	void InsertTag(const std::string&);
+	void EraseTag(const std::string&);
 	// Class method to access the database
 	static std::unordered_map<std::string, std::vector<std::string>>& GetDatabase()
 	{

vns-cpp/processor.cpp

@@ -269,13 +269,12 @@ void Processor::convert(int starting_index)
 			else if (tag == "scene")
 			{
 				assert(!previous_.empty());
-				output_[section_][previous_].next = ContentNext("scene", "");
+				output_[section_][previous_].next = output_[section_][previous_].next.has_multi_targets()
+					                                    ? ContentNext(
+						                                    "scene", output_[section_][previous_].next.get_targets())
+					                                    : ContentNext(
+						                                    "scene", output_[section_][previous_].next.get_target());
 				current_data_.background_image = extract_parameter(currentLine);
-
-				if (!current_data_.background_image.empty() && current_data_.background_image.length() == 0)
-				{
-					current_data_.background_image = nullptr;
-				}
 				blocked_ = true;
 			}
 			else if (tag == "block")
@@ -343,14 +342,14 @@ void Processor::convert(int starting_index)
 				if (std::find(narrator_possible_images.begin(), narrator_possible_images.end(), name_data.GetName()) !=
 					narrator_possible_images.end())
 				{
-					if (name_data.GetTags().contains("silent"))
+					if (name_data.ContainsTag("silent"))
 					{
-						name_data.GetTags().erase("silent");
+						name_data.EraseTag("silent");
 					}
 				}
 				else
 				{
-					name_data.GetTags().insert("silent");
+					name_data.InsertTag("silent");
 				}
 				current_data_.character_images[i] = name_data.ToString();
 			}
@@ -402,7 +401,8 @@ void Processor::convert(int starting_index)
 					}
 					else
 					{
-						output_[section_][previous_].next = ContentNext("default", dialog_associate_key_[line_index_]);
+						output_[section_][previous_].next = ContentNext(output_[section_][previous_].next.get_type(),
+						                                                dialog_associate_key_[line_index_]);
 					}
 				}
 				else

vns-cpp/tests.cpp

@@ -33,7 +33,7 @@ void TestNullNext()
 	const ContentNext test_null_next;
 	assert(test_null_next.is_null());
 	assert(!test_null_next.has_multi_targets());
-	assert(test_null_next.get_type() == "null");
+	assert(test_null_next.get_type() == "default");
 	assert(test_null_next.get_target().empty());
 }