backups/LCEMP
1
0
Fork 0
mirror of https://github.com/LCEMP/LCEMP.git synced 2026-04-26 08:53:54 +00:00
Code Issues Actions 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
Show stats 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;
}

12
Minecraft.Client/Common/Tutorial/ControllerTask.cpp
View file

@ -7,6 +7,10 @@
#include "TutorialConstraints.h"
#include "ControllerTask.h"
#ifdef _WINDOWS64
#include "..\..\KeyboardMouseInput.h"
#endif
ControllerTask::ControllerTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, bool showMinimumTime,
int mappings[], unsigned int mappingsLength, int iCompletionMaskA[], int iCompletionMaskACount, int iSouthpawMappings[], unsigned int uiSouthpawMappingsCount)
: TutorialTask( tutorial, descriptionId, enablePreCompletion, NULL, showMinimumTime )
@ -66,7 +70,11 @@ bool ControllerTask::isCompleted()
}
else
{
#ifdef _WINDOWS64
bAllComplete = true;
#else
bAllComplete = false;
#endif
}
}
iCurrent++;
@ -87,7 +95,11 @@ bool ControllerTask::isCompleted()
}
else
{
#ifdef _WINDOWS64
bAllComplete = true;
#else
bAllComplete = false;
#endif
}
}
iCurrent++;

20
Minecraft.Client/Common/Tutorial/InfoTask.cpp
View file

@ -8,6 +8,20 @@
#include "InfoTask.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
InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
: TutorialTask( tutorial, descriptionId, false, NULL, true, false, false )
@ -65,12 +79,16 @@ bool InfoTask::isCompleted()
bool current = (*it).second;
if(!current)
{
#ifdef _WINDOWS64
if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), (*it).first) > 0 || g_KBMInput.IsKeyDown(ActionToVK((*it).first)) )
#else
if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), (*it).first) > 0 )
#endif
{
(*it).second = true;
bAllComplete=true;
}
else
if (!(*it).second)
{
bAllComplete = false;
}

2
Minecraft.Client/KeyboardMouseInput.h
View file

@ -23,6 +23,8 @@ public:
static const int KEY_DROP = 'Q';
static const int KEY_CRAFTING = VK_TAB;
static const int KEY_CRAFTING_ALT = 'R';
static const int KEY_CONFIRM = VK_RETURN;
static const int KEY_CANCEL = VK_ESCAPE;
static const int KEY_PAUSE = VK_ESCAPE;
static const int KEY_THIRD_PERSON = VK_F5;
static const int KEY_DEBUG_INFO = VK_F3;

2
Minecraft.Client/Minecraft.cpp
View file

@ -1504,7 +1504,7 @@ void Minecraft::run_middle()
}
// Utility keys always work regardless of KBM active state
if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_PAUSE))
if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_PAUSE) && !ui.IsTutorialVisible(i))
{
localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_PAUSEMENU;
app.DebugPrintf("PAUSE PRESSED (keyboard) - ipad = %d\n",i);