From 64322c07a3da7313ff2004e1862cc3f58c6c711d Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Wed, 11 Mar 2026 01:56:50 +1100
Subject: [PATCH] Use standard tip IDs in common app

---
 Minecraft.Client/Platform/Common/App_structs.h    | 2 +-
 Minecraft.Client/Platform/Common/Consoles_App.cpp | 4 ++--
 Minecraft.Client/Platform/Common/Consoles_App.h   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h
index 1d73e7c1b..50fffa5b7 100644
--- a/Minecraft.Client/Platform/Common/App_structs.h
+++ b/Minecraft.Client/Platform/Common/App_structs.h
@@ -144,7 +144,7 @@ XuiActionParam;
 typedef struct 
 {    
 	int iSortValue;
-	UINT uiStringID;
+	int uiStringID;
 }
 TIPSTRUCT;
 
diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp
index f0de38ee7..83e9c0906 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp
@@ -5868,7 +5868,7 @@ void CMinecraftApp::InitialiseTips()
 {
 	// We'll randomise the tips at start up based on their priority
 
-	ZeroMemory(m_TipIDA,sizeof(UINT)*MAX_TIPS_GAMETIP+MAX_TIPS_TRIVIATIP);
+	ZeroMemory(m_TipIDA, sizeof(m_TipIDA));
 
 	// Make the first tip tell you that you can play splitscreen in HD modes if you are in SD
 	if(!RenderManager.IsHiDef())
@@ -5932,7 +5932,7 @@ void CMinecraftApp::InitialiseTips()
 	m_uiCurrentTip=0;
 }
 
-UINT CMinecraftApp::GetNextTip()
+int CMinecraftApp::GetNextTip()
 {
 	static bool bShowSkinDLCTip=true;
 	// don't display the DLC tip in the trial game
diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h
index 3c21780cd..93940cac7 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.h
+++ b/Minecraft.Client/Platform/Common/Consoles_App.h
@@ -549,7 +549,7 @@ protected:
 	static Random *TipRandom;
 public:
 	void InitialiseTips();
-	UINT GetNextTip();
+	int GetNextTip();
 	int GetHTMLColour(eMinecraftColour colour);
 	int GetHTMLColor(eMinecraftColour colour) { return GetHTMLColour(colour); }
 	int GetHTMLFontSize(EHTMLFontSize size);
@@ -565,8 +565,8 @@ public:
 	static void ExitGameFromRemoteSave( void *lpParameter );
 	static int ExitGameFromRemoteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
 private:
-	UINT m_TipIDA[MAX_TIPS_GAMETIP+MAX_TIPS_TRIVIATIP];
-	UINT m_uiCurrentTip;
+	int m_TipIDA[MAX_TIPS_GAMETIP+MAX_TIPS_TRIVIATIP];
+	unsigned int m_uiCurrentTip;
 	static int TipsSortFunction(const void* a, const void* b);
 
 	// XML