mirror of
https://github.com/LCEMP/LCEMP.git
synced 2026-04-26 00:43:51 +00:00
Merge 541882cba5 into db79e7d54c
This commit is contained in:
commit
bece9ceafd
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -184,3 +184,4 @@ Minecraft.Client/PS3/PS3Extras/HeapInspector/
|
|||
|
||||
# Sony remote storage libs
|
||||
Minecraft.Client/Common/Network/Sony/
|
||||
/.vs
|
||||
|
|
|
|||
|
|
@ -1026,18 +1026,18 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
|
|||
int vk = 0;
|
||||
switch (key)
|
||||
{
|
||||
case ACTION_MENU_OK: case ACTION_MENU_A: vk = VK_RETURN; break;
|
||||
case ACTION_MENU_CANCEL: case ACTION_MENU_B: vk = VK_ESCAPE; break;
|
||||
case ACTION_MENU_UP: vk = VK_UP; break;
|
||||
case ACTION_MENU_DOWN: vk = VK_DOWN; break;
|
||||
case ACTION_MENU_LEFT: vk = VK_LEFT; break;
|
||||
case ACTION_MENU_RIGHT: vk = VK_RIGHT; break;
|
||||
case ACTION_MENU_X: vk = 'E'; break;
|
||||
case ACTION_MENU_Y: vk = VK_TAB; break;
|
||||
case ACTION_MENU_LEFT_SCROLL: vk = 'Q'; break;
|
||||
case ACTION_MENU_RIGHT_SCROLL: vk = 'R'; break;
|
||||
case ACTION_MENU_PAGEUP: vk = VK_PRIOR; break;
|
||||
case ACTION_MENU_PAGEDOWN: vk = VK_NEXT; break;
|
||||
case ACTION_MENU_OK: case ACTION_MENU_A: vk = KeyboardMouseInput::KEY_MENU_A; break;
|
||||
case ACTION_MENU_CANCEL: case ACTION_MENU_B: vk = KeyboardMouseInput::KEY_MENU_B; break;
|
||||
case ACTION_MENU_UP: vk = KeyboardMouseInput::KEY_MENU_UP; break;
|
||||
case ACTION_MENU_DOWN: vk = KeyboardMouseInput::KEY_MENU_DOWN; break;
|
||||
case ACTION_MENU_LEFT: vk = KeyboardMouseInput::KEY_MENU_LEFT; break;
|
||||
case ACTION_MENU_RIGHT: vk = KeyboardMouseInput::KEY_MENU_RIGHT; break;
|
||||
case ACTION_MENU_X: vk = KeyboardMouseInput::KEY_MENU_X; break;
|
||||
case ACTION_MENU_Y: vk = KeyboardMouseInput::KEY_MENU_Y; break;
|
||||
case ACTION_MENU_LEFT_SCROLL: vk = KeyboardMouseInput::KEY_MENU_LEFT_SCROLL; break;
|
||||
case ACTION_MENU_RIGHT_SCROLL: vk = KeyboardMouseInput::KEY_MENU_RIGHT_SCROLL; break;
|
||||
case ACTION_MENU_PAGEUP: vk = KeyboardMouseInput::KEY_MENU_PAGEUP; break;
|
||||
case ACTION_MENU_PAGEDOWN: vk = KeyboardMouseInput::KEY_MENU_PAGEDOWN; break;
|
||||
}
|
||||
if (vk != 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,6 +26,20 @@ public:
|
|||
static const int KEY_PAUSE = VK_ESCAPE;
|
||||
static const int KEY_THIRD_PERSON = VK_F5;
|
||||
static const int KEY_DEBUG_INFO = VK_F3;
|
||||
static const int KEY_FPS_TOGGLE = VK_F4;
|
||||
|
||||
static const int KEY_MENU_UP = VK_UP;
|
||||
static const int KEY_MENU_DOWN = VK_DOWN;
|
||||
static const int KEY_MENU_LEFT = VK_LEFT;
|
||||
static const int KEY_MENU_RIGHT = VK_RIGHT;
|
||||
static const int KEY_MENU_A = VK_RETURN;
|
||||
static const int KEY_MENU_B = VK_ESCAPE;
|
||||
static const int KEY_MENU_X = 'E';
|
||||
static const int KEY_MENU_Y = VK_TAB;
|
||||
static const int KEY_MENU_LEFT_SCROLL = 'Q';
|
||||
static const int KEY_MENU_RIGHT_SCROLL = 'R';
|
||||
static const int KEY_MENU_PAGEUP = VK_PRIOR;
|
||||
static const int KEY_MENU_PAGEDOWN = VK_NEXT;
|
||||
|
||||
void Init();
|
||||
void Tick();
|
||||
|
|
|
|||
|
|
@ -1519,7 +1519,7 @@ void Minecraft::run_middle()
|
|||
//localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
|
||||
}
|
||||
|
||||
if(g_KBMInput.IsKeyPressed(VK_F4))
|
||||
if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_FPS_TOGGLE))
|
||||
{
|
||||
showFpsCounter = !showFpsCounter;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue