From aa69d63a655799a1939eae2e48324ff413df9283 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 1 Nov 2018 09:02:20 +0100
Subject: [PATCH] - made DBrokenLines serializable.

---
 src/v_text.cpp | 28 ++++++++++++++++++++--------
 src/v_text.h   | 10 +++++-----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/v_text.cpp b/src/v_text.cpp
index 6fea75bb5..7e4a44b89 100644
--- a/src/v_text.cpp
+++ b/src/v_text.cpp
@@ -45,6 +45,7 @@
 
 #include "gstrings.h"
 #include "vm.h"
+#include "serializer.h"
 
 int ListGetInt(VMVa_List &tags);
 
@@ -345,7 +346,7 @@ static void breakit (FBrokenLines *line, FFont *font, const uint8_t *start, cons
 	line->Width = font->StringWidth (line->Text);
 }
 
-TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const uint8_t *string, bool preservecolor, unsigned int *count)
+TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const uint8_t *string, bool preservecolor)
 {
 	TArray<FBrokenLines> Lines(128);
 
@@ -451,28 +452,40 @@ TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const uint8_t *str
 	return Lines;
 }
 
-void V_FreeBrokenLines (FBrokenLines *lines)
+FSerializer &Serialize(FSerializer &arc, const char *key, FBrokenLines& g, FBrokenLines *def)
 {
-	if (lines)
+	if (arc.BeginObject(key))
 	{
-		delete[] lines;
+		arc("text", g.Text)
+			("width", g.Width)
+			.EndObject();
 	}
+	return arc;
 }
 
+
+
 class DBrokenLines : public DObject
 {
-	DECLARE_ABSTRACT_CLASS(DBrokenLines, DObject)
+	DECLARE_CLASS(DBrokenLines, DObject)
 
 public:
 	TArray<FBrokenLines> mBroken;
 
+	DBrokenLines() = default;
+
 	DBrokenLines(TArray<FBrokenLines> &broken)
 	{
 		mBroken = std::move(broken);
 	}
+
+	void Serialize(FSerializer &arc) override
+	{
+		arc("lines", mBroken);
+	}
 };
 
-IMPLEMENT_CLASS(DBrokenLines, true, false);
+IMPLEMENT_CLASS(DBrokenLines, false, false);
 
 DEFINE_ACTION_FUNCTION(DBrokenLines, Count)
 {
@@ -500,7 +513,6 @@ DEFINE_ACTION_FUNCTION(FFont, BreakLines)
 	PARAM_STRING(text);
 	PARAM_INT(maxwidth);
 
-	unsigned int count;
-	TArray<FBrokenLines> broken = V_BreakLines(self, maxwidth, text, true, &count);
+	auto broken = V_BreakLines(self, maxwidth, text, true);
 	ACTION_RETURN_OBJECT(Create<DBrokenLines>(broken));
 }
diff --git a/src/v_text.h b/src/v_text.h
index 1ae2ca3a5..30efa286f 100644
--- a/src/v_text.h
+++ b/src/v_text.h
@@ -79,11 +79,11 @@ struct FBrokenLines
 #define TEXTCOLOR_CHAT			"\034*"
 #define TEXTCOLOR_TEAMCHAT		"\034!"
 
-TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const uint8_t *str, bool preservecolor = false, unsigned int *count = nullptr);
-inline TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const char *str, bool preservecolor = false, unsigned int *count = nullptr)
- { return V_BreakLines (font, maxwidth, (const uint8_t *)str, preservecolor, count); }
-inline TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const FString &str, bool preservecolor = false, unsigned int *count = nullptr)
- { return V_BreakLines (font, maxwidth, (const uint8_t *)str.GetChars(), preservecolor, count); }
+TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const uint8_t *str, bool preservecolor = false);
+inline TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const char *str, bool preservecolor = false)
+ { return V_BreakLines (font, maxwidth, (const uint8_t *)str, preservecolor); }
+inline TArray<FBrokenLines> V_BreakLines (FFont *font, int maxwidth, const FString &str, bool preservecolor = false)
+ { return V_BreakLines (font, maxwidth, (const uint8_t *)str.GetChars(), preservecolor); }
 
 int GetCharFromString(const uint8_t *&string);