From 7fec50ef6c6453370f9cfc7cf4bf39f5f8727934 Mon Sep 17 00:00:00 2001 From: FearDragon Date: Sun, 9 Mar 2025 18:39:15 -0400 Subject: [PATCH 1/2] Initializes text upon object creation. --- Nautilus/Utility/BasicText.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Nautilus/Utility/BasicText.cs b/Nautilus/Utility/BasicText.cs index b044e4a69..e55470cd1 100644 --- a/Nautilus/Utility/BasicText.cs +++ b/Nautilus/Utility/BasicText.cs @@ -49,6 +49,7 @@ public BasicText() CloneFont = true; CloneStyle = true; CloneMaterial = true; + InitializeText(); } /// @@ -60,6 +61,7 @@ public BasicText(int set_x, int set_y) : this() { X = set_x; Y = set_y; + InitializeText(); } /// @@ -70,6 +72,7 @@ public BasicText(TextAlignmentOptions useAlign) : this() { CloneAlign = false; Align = useAlign; + InitializeText(); } /// @@ -80,6 +83,7 @@ public BasicText(Color useColor) : this() { CloneColor = false; Color = useColor; + InitializeText(); } /// @@ -90,6 +94,7 @@ public BasicText(int useSize) : this() { CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -103,6 +108,7 @@ public BasicText(int useSize, Color useColor) : this() Color = useColor; CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -116,6 +122,7 @@ public BasicText(int useSize, TextAlignmentOptions useAlign) : this() Align = useAlign; CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -132,6 +139,7 @@ public BasicText(int useSize, Color useColor, TextAlignmentOptions useAlign) : t Color = useColor; CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -152,6 +160,7 @@ public BasicText(int set_x, int set_y, int useSize, Color useColor, TextAlignmen Color = useColor; CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -169,6 +178,7 @@ public BasicText(int set_x, int set_y, int useSize, Color useColor) : this() Color = useColor; CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -183,6 +193,7 @@ public BasicText(int set_x, int set_y, int useSize) : this() Y = set_y; CloneSize = false; Size = useSize; + InitializeText(); } /// @@ -201,12 +212,6 @@ public void ShowMessage(string s) /// The duration to hold before fading public void ShowMessage(string s, float seconds) { - if (TextObject == null) - { - // First time only, initialize the object and components - InitializeText(); - } - // Set our actual text TextFade.SetText(s); From faaf830d6c02e76a4e42e5bf91b89751d4c5840f Mon Sep 17 00:00:00 2001 From: FearDragon <65637269+FearDragon@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:30:30 -0400 Subject: [PATCH 2/2] Removed InitializeText from all constructors except the base constructor. --- Nautilus/Utility/BasicText.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Nautilus/Utility/BasicText.cs b/Nautilus/Utility/BasicText.cs index e55470cd1..8ff7ebd65 100644 --- a/Nautilus/Utility/BasicText.cs +++ b/Nautilus/Utility/BasicText.cs @@ -61,7 +61,6 @@ public BasicText(int set_x, int set_y) : this() { X = set_x; Y = set_y; - InitializeText(); } /// @@ -72,7 +71,6 @@ public BasicText(TextAlignmentOptions useAlign) : this() { CloneAlign = false; Align = useAlign; - InitializeText(); } /// @@ -83,7 +81,6 @@ public BasicText(Color useColor) : this() { CloneColor = false; Color = useColor; - InitializeText(); } /// @@ -94,7 +91,6 @@ public BasicText(int useSize) : this() { CloneSize = false; Size = useSize; - InitializeText(); } /// @@ -108,7 +104,6 @@ public BasicText(int useSize, Color useColor) : this() Color = useColor; CloneSize = false; Size = useSize; - InitializeText(); } /// @@ -122,7 +117,6 @@ public BasicText(int useSize, TextAlignmentOptions useAlign) : this() Align = useAlign; CloneSize = false; Size = useSize; - InitializeText(); } /// @@ -139,7 +133,6 @@ public BasicText(int useSize, Color useColor, TextAlignmentOptions useAlign) : t Color = useColor; CloneSize = false; Size = useSize; - InitializeText(); } /// @@ -160,7 +153,6 @@ public BasicText(int set_x, int set_y, int useSize, Color useColor, TextAlignmen Color = useColor; CloneSize = false; Size = useSize; - InitializeText(); } /// @@ -178,7 +170,6 @@ public BasicText(int set_x, int set_y, int useSize, Color useColor) : this() Color = useColor; CloneSize = false; Size = useSize; - InitializeText(); } /// @@ -193,7 +184,6 @@ public BasicText(int set_x, int set_y, int useSize) : this() Y = set_y; CloneSize = false; Size = useSize; - InitializeText(); } ///