diff --git a/Minecraft.Client/Input.cpp b/Minecraft.Client/Input.cpp index d49c0c8..120fab5 100644 --- a/Minecraft.Client/Input.cpp +++ b/Minecraft.Client/Input.cpp @@ -164,25 +164,6 @@ void Input::tick(LocalPlayer *player) player->interpolateTurn(tx* abs(tx)* turnSpeed, ty* abs(ty)* turnSpeed); -#ifdef _WINDOWS64 - if (iPad == 0 && g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive()) - { - int dx = g_KBMInput.GetRawDeltaX(); - int dy = g_KBMInput.GetRawDeltaY(); - g_KBMInput.ConsumeMouseDelta(); - if (dx != 0 || dy != 0) - { - float mouseSensitivity = ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InGame)) / 100.0f; - float mouseLookScale = 5.0f; - float mdx = dx * mouseSensitivity * mouseLookScale; - float mdy = -dy * mouseSensitivity * mouseLookScale; - if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook)) - mdy = -mdy; - player->interpolateTurn(mdx, mdy); - } - } -#endif - //jumping = controller.isButtonPressed(0); unsigned int jump = InputManager.GetValue(iPad, MINECRAFT_ACTION_JUMP); diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 6a6bfea..8a8dc2f 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -493,6 +493,35 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } } } +#ifdef _WINDOWS64 + Minecraft* instance = Minecraft::GetInstance(); + if (!instance) + break; + + LocalPlayer* player = instance->localplayers[0].get(); + if (!player) + break; + + int iPad = player->GetXboxPad(); + if (iPad == 0 && g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive()) + { + int dx = g_KBMInput.GetRawDeltaX(); + int dy = g_KBMInput.GetRawDeltaY(); + g_KBMInput.ConsumeMouseDelta(); + + if (dx != 0 || dy != 0) + { + float mouseSensitivity = ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InGame)) / 100.0f; + float mouseLookScale = 1.0f; + float mdx = dx * mouseSensitivity * mouseLookScale; + float mdy = -dy * mouseSensitivity * mouseLookScale; + + if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook)) + mdy = -mdy; + instance->player->turn(mdx, mdy); + } + } +#endif } break;