diff options
| author | red <80164245+gabriel-fondato@users.noreply.github.com> | 2026-03-02 02:40:04 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-02 13:40:04 +0800 |
| commit | fa4a1206b3aead0a946479f28629bd539ed6643c (patch) | |
| tree | fd22a72a67b2a9d05a7133e47fba06b1c6ea82e6 /Minecraft.Client/Common/Tutorial/ChoiceTask.cpp | |
| parent | 75bf7ee54a2d4bbaded95453ac699c5d2d529628 (diff) | |
feat: now can skip the tutorial (#82)
* now possible to accept and decline tutorial hints
that part when it asks if you want to do the tutorial (should work for when the games asks if you already know something like when opening inventories for the first time)
* Update ChoiceTask.cpp
---------
Co-authored-by: daoge <3523206925@qq.com>
Diffstat (limited to 'Minecraft.Client/Common/Tutorial/ChoiceTask.cpp')
| -rw-r--r-- | Minecraft.Client/Common/Tutorial/ChoiceTask.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp index c03166b5..49fb068b 100644 --- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp @@ -7,6 +7,7 @@ #include "TutorialConstraints.h" #include "ChoiceTask.h" #include "..\..\..\Minecraft.World\Material.h" +#include "..\..\Windows64\KeyboardMouseInput.h" ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/, @@ -51,11 +52,11 @@ bool ChoiceTask::isCompleted() // If the player is under water then allow all keypresses so they can jump out if( pMinecraft->localplayers[tutorial->getPad()]->isUnderLiquid(Material::water) ) return false; - if(!m_bConfirmMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iConfirmMapping) > 0 ) + if(!m_bConfirmMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iConfirmMapping) > 0 || KMInput.IsKeyDown(VK_RETURN)) { m_bConfirmMappingComplete = true; } - if(!m_bCancelMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iCancelMapping) > 0 ) + if(!m_bCancelMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iCancelMapping) > 0 || KMInput.IsKeyDown('B')) { m_bCancelMappingComplete = true; } @@ -99,11 +100,11 @@ void ChoiceTask::handleUIInput(int iAction) { if(bHasBeenActivated && m_bShownForMinimumTime) { - if( iAction == m_iConfirmMapping ) + if( iAction == m_iConfirmMapping) { m_bConfirmMappingComplete = true; } - else if(iAction == m_iCancelMapping ) + else if(iAction == m_iCancelMapping) { m_bCancelMappingComplete = true; } |