feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 8 insertions, 16 deletions

diff --git a/Minecraft.Client/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Common/UI/UIControl_Label.cpp
index 1481fea1..47374d21 100644
--- a/Minecraft.Client/Common/UI/UIControl_Label.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Label.cpp
@@ -5,6 +5,7 @@
 
 UIControl_Label::UIControl_Label()
 {
+	m_reinitEnabled = true;
 }
 
 bool UIControl_Label::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
@@ -17,7 +18,7 @@ bool UIControl_Label::setupControl(UIScene *scene, IggyValuePath *parent, const
 	return success;
 }
 
-void UIControl_Label::init(const wstring &label)
+void UIControl_Label::init(UIString label)
 {
 	m_label = label;
 
@@ -32,22 +33,13 @@ void UIControl_Label::init(const wstring &label)
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_initFunc , 1 , value );
 }
 
-void UIControl_Label::init(const string &label)
-{
-	m_label = convStringToWstring(label);
-	IggyDataValue result;
-	IggyDataValue value[1];
-	value[0].type = IGGY_DATATYPE_string_UTF8;
-	IggyStringUTF8 stringVal;
-
-	stringVal.string = (char *)label.c_str();
-	stringVal.length = label.length();
-	value[0].string8 = stringVal;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_initFunc , 1 , value );
-}
-
 void UIControl_Label::ReInit()
 {
 	UIControl_Base::ReInit();
-	init(m_label);
+	
+	// 4J-JEV: This can't be reinitialised.
+	if (m_reinitEnabled)
+	{
+		init(m_label);
+	}
 }