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

22
Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.h
View File

@@ -10,13 +10,22 @@ private:
eControl_GameOptions,
eControl_GamePlayers,
};
typedef struct _PlayerInfo
{
byte m_smallId;
char m_voiceStatus;
short m_colorState;
wstring m_name;
} PlayerInfo;
bool m_isHostPlayer;
int m_playersCount;
BYTE m_players[MINECRAFT_NET_MAX_PLAYERS]; // An array of QNet small-id's
char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS];
short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS];
wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS];
//int m_playersCount;
vector<PlayerInfo *> m_players; // A vector of player info structs
//char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS];
//short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS];
//wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS];
UIControl_Button m_buttonGameOptions;
UIControl_PlayerList m_playerList;
@@ -28,6 +37,7 @@ private:
UI_END_MAP_ELEMENTS_AND_NAMES()
public:
UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer);
virtual ~UIScene_InGameInfoMenu();
virtual EUIScene getSceneType() { return eUIScene_InGameInfoMenu;}
virtual void updateTooltips();
@@ -55,6 +65,8 @@ public:
static void OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving);
private:
PlayerInfo *BuildPlayerInfo(INetworkPlayer *player);
#if defined(__PS3__) || defined (__PSVITA__) || defined(__ORBIS__)
static int MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result);
static int ViewInvites_SignInReturned(void *pParam,bool bContinue, int iPad);