LegacyConsole/LCEMP-LCEMP
3
0
Fork 0
mirror of https://github.com/LCEMP/LCEMP.git synced 2026-05-25 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

add choicetask input support for kbm

Browse Source
This commit is contained in:
NOTPIES
2026-03-03 20:04:29 -03:00
parent 78052a4222
commit f30619d597
5 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
View File

@@ -8,6 +8,20 @@
#include "ChoiceTask.h"
#include "..\..\..\Minecraft.World\Material.h"
#ifdef _WINDOWS64
#include "..\..\KeyboardMouseInput.h"
static int ActionToVK(int action)
{
switch (action)
{
case ACTION_MENU_A: return KeyboardMouseInput::KEY_CONFIRM;
case ACTION_MENU_B: return KeyboardMouseInput::KEY_CANCEL;
default: return 0;
}
}
#endif
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
eTutorial_CompletionAction cancelAction /*= e_Tutorial_Completion_None*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
@@ -51,11 +65,24 @@ 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 )
int xboxPad = pMinecraft->player->GetXboxPad();
#ifdef _WINDOWS64
if(!m_bConfirmMappingComplete &&
(InputManager.GetValue(xboxPad, m_iConfirmMapping) > 0
|| g_KBMInput.IsKeyDown(ActionToVK(m_iConfirmMapping))))
#else
if(!m_bConfirmMappingComplete && InputManager.GetValue(xboxPad, m_iConfirmMapping) > 0 )
#endif
{
m_bConfirmMappingComplete = true;
}
if(!m_bCancelMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iCancelMapping) > 0 )
#ifdef _WINDOWS64
if(!m_bCancelMappingComplete &&
(InputManager.GetValue(xboxPad, m_iCancelMapping) > 0
|| g_KBMInput.IsKeyDown(ActionToVK(m_iCancelMapping))))
#else
if(!m_bCancelMappingComplete && InputManager.GetValue(xboxPad, m_iCancelMapping) > 0 )
#endif
{
m_bCancelMappingComplete = true;
}