From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001
From: daoge <3523206925@qq.com>
Date: Tue, 3 Mar 2026 03:04:10 +0800
Subject: 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>
---
 Minecraft.World/ClientSideMerchant.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Minecraft.World/ClientSideMerchant.h')

diff --git a/Minecraft.World/ClientSideMerchant.h b/Minecraft.World/ClientSideMerchant.h
index 33f0c0b1..085768ca 100644
--- a/Minecraft.World/ClientSideMerchant.h
+++ b/Minecraft.World/ClientSideMerchant.h
@@ -10,21 +10,21 @@ class ClientSideMerchant : public Merchant, public enable_shared_from_this<Clien
 {
 private:
 	MerchantContainer *container;
-    shared_ptr<Player> source;
-    MerchantRecipeList *currentOffers;
-	int m_name;
+	shared_ptr<Player> source;
+	MerchantRecipeList *currentOffers;
+	wstring m_name;
 
 public:
-	ClientSideMerchant(shared_ptr<Player> source, int name);
+	ClientSideMerchant(shared_ptr<Player> source, const wstring &name);
 	~ClientSideMerchant();
 
 	void createContainer(); // 4J Added
-    Container *getContainer();
-    shared_ptr<Player> getTradingPlayer();
-    void setTradingPlayer(shared_ptr<Player> player);
-    MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
-    void overrideOffers(MerchantRecipeList *recipeList);
-    void notifyTrade(MerchantRecipe *activeRecipe);
+	Container *getContainer();
+	shared_ptr<Player> getTradingPlayer();
+	void setTradingPlayer(shared_ptr<Player> player);
+	MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
+	void overrideOffers(MerchantRecipeList *recipeList);
+	void notifyTrade(MerchantRecipe *activeRecipe);
 	void notifyTradeUpdated(shared_ptr<ItemInstance> item);
-	int getDisplayName();
+	wstring getDisplayName();
 };
\ No newline at end of file
-- 
cgit v1.2.3