Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 97a4399472.

* 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>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.Client/Common/UI/UIScene_TradingMenu.h
View File

@@ -23,7 +23,7 @@ protected:
UIControl_Label m_labelTrading, m_labelRequired;
UIControl_Label m_labelRequest1, m_labelRequest2;
IggyName m_funcMoveSelector, m_funcShowScrollRightArrow, m_funcShowScrollLeftArrow, m_funcSetOfferDescription;
IggyName m_funcMoveSelector, m_funcShowScrollRightArrow, m_funcShowScrollLeftArrow, m_funcSetOfferDescription, m_funcSetActiveSlot;
UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
UI_MAP_ELEMENT( m_controlMainPanel, "MainPanel" )
@@ -48,6 +48,7 @@ protected:
UI_MAP_NAME(m_funcShowScrollRightArrow, L"ShowScrollRightArrow")
UI_MAP_NAME(m_funcShowScrollLeftArrow, L"ShowScrollLeftArrow")
UI_MAP_NAME(m_funcSetOfferDescription, L"SetOfferDescription")
UI_MAP_NAME(m_funcSetActiveSlot, L"SetSelectorSlot")
UI_END_MAP_ELEMENTS_AND_NAMES()
virtual wstring getMoviePath();
@@ -72,7 +73,10 @@ protected:
virtual void setRequest2RedBox(bool show);
virtual void setTradeRedBox(int index, bool show);
virtual void setOfferDescription(const wstring &name, vector<wstring> &unformattedStrings);
virtual void setOfferDescription(vector<HtmlString> *description);
virtual void HandleMessage(EUIMessage message, void *data);
void handleInventoryUpdated(LPVOID data);
int getPad() { return m_iPad; }
};