diff --git a/minecraft/4J.Profile/4J_Profile.h b/minecraft/4J.Profile/4J_Profile.h index c8f00228a..5b483078b 100644 --- a/minecraft/4J.Profile/4J_Profile.h +++ b/minecraft/4J.Profile/4J_Profile.h @@ -70,9 +70,6 @@ public: // --- Dead stubs (inline no-ops, kept for call-site compat) --- void Tick() {} - void SetTrialTextStringTable(CXuiStringTable*, int, int) {} - void SetTrialAwardText(EAwardType, int, int) {} - void StartTrialGame() {} unsigned int RequestSignInUI(bool, bool, bool, bool, bool, int (*)(void*, const bool, const int), void*, int = XUSER_INDEX_ANY) { return 0; } @@ -112,9 +109,6 @@ public: void RegisterRichPresenceContext(int) {} void SetRichPresenceContextValue(int, int, int) {} void SetCurrentGameActivity(int, int, bool = false) {} - void DisplayFullVersionPurchase(bool, int, int = -1) {} - void SetUpsellCallback(void (*)(void*, EUpsellType, EUpsellResponse, int), - void*) {} void SetDebugFullOverride(bool) {} // GetPrimaryPad/SetPrimaryPad moved to InputManager diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.h b/minecraft/Minecraft.Client/Common/Consoles_App.h index becc08968..bac38cc71 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.h +++ b/minecraft/Minecraft.Client/Common/Consoles_App.h @@ -363,9 +363,6 @@ public: bool GetLiveLinkRequired() { return m_bLiveLinkRequired; } void SetLiveLinkRequired(bool required) { m_bLiveLinkRequired = required; } - static void UpsellReturnedCallback(void* pParam, EUpsellType type, - EUpsellResponse result, int iUserData); - #if defined(_DEBUG_MENUS_ENABLED) bool DebugSettingsOn() { return m_bDebugOptions; } bool DebugArtToolsOn(); diff --git a/minecraft/platform/IPlatformProfile.h b/minecraft/platform/IPlatformProfile.h index b49ac08a5..f12ce9737 100644 --- a/minecraft/platform/IPlatformProfile.h +++ b/minecraft/platform/IPlatformProfile.h @@ -91,13 +91,6 @@ public: [[nodiscard]] virtual void* GetGameDefinedProfileData(int iQuadrant) = 0; virtual void ResetProfileProcessState() = 0; - // Trial - virtual void StartTrialGame() = 0; - virtual void SetTrialTextStringTable(CXuiStringTable* pStringTable, - int iAccept, int iReject) = 0; - virtual void SetTrialAwardText(EAwardType AwardType, int iTitle, - int iText) = 0; - // Content virtual void AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, bool* allAllowed, @@ -137,14 +130,6 @@ public: virtual void SetCurrentGameActivity(int iPad, int iNewPresence, bool bSetOthersToIdle = false) = 0; - // Purchase - virtual void DisplayFullVersionPurchase(bool bRequired, int iQuadrant, - int iUpsellParam = -1) = 0; - virtual void SetUpsellCallback( - void (*Func)(void* lpParam, EUpsellType type, EUpsellResponse response, - int iUserData), - void* lpParam) = 0; - // Debug virtual void SetDebugFullOverride(bool bVal) = 0; }; diff --git a/minecraft/platform/IPlatformUIController.h b/minecraft/platform/IPlatformUIController.h index fd2f074ae..b968a561e 100644 --- a/minecraft/platform/IPlatformUIController.h +++ b/minecraft/platform/IPlatformUIController.h @@ -92,12 +92,6 @@ public: virtual void HideAllGameUIElements() = 0; virtual void ShowOtherPlayersBaseScene(unsigned int iPad, bool show) = 0; - // Trial timer - virtual void ShowTrialTimer(bool show) = 0; - virtual void SetTrialTimerLimitSecs(unsigned int uiSeconds) = 0; - virtual void UpdateTrialTimer(unsigned int iPad) = 0; - virtual void ReduceTrialTimerValue() = 0; - // Autosave virtual void ShowAutosaveCountdownTimer(bool show) = 0; virtual void UpdateAutosaveCountdownTimer(unsigned int uiSeconds) = 0; diff --git a/minecraft/platform/PlatformTypes.h b/minecraft/platform/PlatformTypes.h index 3849107c2..47a0c5fe0 100644 --- a/minecraft/platform/PlatformTypes.h +++ b/minecraft/platform/PlatformTypes.h @@ -55,19 +55,6 @@ enum class EAwardType { AvatarItem, }; -enum class EUpsellType { - Custom = 0, - Achievement, - GamerPic, - Theme, - AvatarItem, -}; - -enum class EUpsellResponse { - Declined, - Accepted_NoPurchase, - Accepted_Purchase, -}; // Backwards-compatible aliases for call sites still using the old // unscoped names. Remove these as call sites are migrated. @@ -81,12 +68,3 @@ inline constexpr auto eAwardType_GamerPic = EAwardType::GamerPic; inline constexpr auto eAwardType_Theme = EAwardType::Theme; inline constexpr auto eAwardType_AvatarItem = EAwardType::AvatarItem; -inline constexpr auto eUpsellType_Custom = EUpsellType::Custom; -inline constexpr auto eUpsellType_Achievement = EUpsellType::Achievement; -inline constexpr auto eUpsellType_GamerPic = EUpsellType::GamerPic; -inline constexpr auto eUpsellType_Theme = EUpsellType::Theme; -inline constexpr auto eUpsellType_AvatarItem = EUpsellType::AvatarItem; - -inline constexpr auto eUpsellResponse_Declined = EUpsellResponse::Declined; -inline constexpr auto eUpsellResponse_Accepted_NoPurchase = EUpsellResponse::Accepted_NoPurchase; -inline constexpr auto eUpsellResponse_Accepted_Purchase = EUpsellResponse::Accepted_Purchase;