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, 11 insertions, 11 deletions

diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
index 7b9886bc..c810ad45 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
@@ -27,14 +27,14 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentL
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Anvil_Menu, this);
 	}
 
-	m_repairMenu = new RepairMenu( initData->inventory, initData->level, initData->x, initData->y, initData->z, pMinecraft->localplayers[iPad] );
+	m_repairMenu = new AnvilMenu( initData->inventory, initData->level, initData->x, initData->y, initData->z, pMinecraft->localplayers[iPad] );
 	m_repairMenu->addSlotListener(this);
 
-	Initialize( iPad, m_repairMenu, true, RepairMenu::INV_SLOT_START, eSectionAnvilUsing, eSectionAnvilMax );
+	Initialize( iPad, m_repairMenu, true, AnvilMenu::INV_SLOT_START, eSectionAnvilUsing, eSectionAnvilMax );
 
-	m_slotListItem1.addSlots(RepairMenu::INPUT_SLOT, 1);
-	m_slotListItem2.addSlots(RepairMenu::ADDITIONAL_SLOT, 1);
-	m_slotListResult.addSlots(RepairMenu::RESULT_SLOT, 1);
+	m_slotListItem1.addSlots(AnvilMenu::INPUT_SLOT, 1);
+	m_slotListItem2.addSlots(AnvilMenu::ADDITIONAL_SLOT, 1);
+	m_slotListResult.addSlots(AnvilMenu::RESULT_SLOT, 1);
 
 	bool expensive = false;
 	wstring m_costString = L"";
@@ -46,7 +46,7 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentL
 			m_costString = app.GetString(IDS_REPAIR_EXPENSIVE);
 			expensive = true;
 		}
-		else if(!m_repairMenu->getSlot(RepairMenu::RESULT_SLOT)->hasItem())
+		else if(!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->hasItem())
 		{
 			// Do nothing
 		}
@@ -56,7 +56,7 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentL
 			wchar_t temp[256];
 			swprintf(temp, 256, costString, m_repairMenu->cost);
 			m_costString = temp;
-			if(!m_repairMenu->getSlot(RepairMenu::RESULT_SLOT)->mayPickup(dynamic_pointer_cast<Player>(m_inventory->player->shared_from_this())))
+			if(!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->mayPickup(dynamic_pointer_cast<Player>(m_inventory->player->shared_from_this())))
 			{
 				expensive = true;
 			}
@@ -85,11 +85,11 @@ wstring UIScene_AnvilMenu::getMoviePath()
 
 void UIScene_AnvilMenu::handleReload()
 {
-	Initialize( m_iPad, m_menu, true, RepairMenu::INV_SLOT_START, eSectionAnvilUsing, eSectionAnvilMax  );
+	Initialize( m_iPad, m_menu, true, AnvilMenu::INV_SLOT_START, eSectionAnvilUsing, eSectionAnvilMax  );
 
-	m_slotListItem1.addSlots(RepairMenu::INPUT_SLOT, 1);
-	m_slotListItem2.addSlots(RepairMenu::ADDITIONAL_SLOT, 1);
-	m_slotListResult.addSlots(RepairMenu::RESULT_SLOT, 1);
+	m_slotListItem1.addSlots(AnvilMenu::INPUT_SLOT, 1);
+	m_slotListItem2.addSlots(AnvilMenu::ADDITIONAL_SLOT, 1);
+	m_slotListResult.addSlots(AnvilMenu::RESULT_SLOT, 1);
 }
 
 void UIScene_AnvilMenu::tick()