Merge branch 'master' of github.com:gtamodding/re3
This commit is contained in:
commit
3580e31ce0
@ -575,14 +575,15 @@ void CPad::UpdateMouse()
|
|||||||
PCTempMouseControllerState.MXB1 = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_4);
|
PCTempMouseControllerState.MXB1 = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_4);
|
||||||
PCTempMouseControllerState.MXB2 = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_5);
|
PCTempMouseControllerState.MXB2 = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_5);
|
||||||
|
|
||||||
PSGLOBAL(lastMousePos.x) = xpos;
|
|
||||||
PSGLOBAL(lastMousePos.y) = ypos;
|
|
||||||
|
|
||||||
if (PSGLOBAL(mouseWheel) > 0)
|
if (PSGLOBAL(mouseWheel) > 0)
|
||||||
PCTempMouseControllerState.WHEELUP = 1;
|
PCTempMouseControllerState.WHEELUP = 1;
|
||||||
else if (PSGLOBAL(mouseWheel) < 0)
|
else if (PSGLOBAL(mouseWheel) < 0)
|
||||||
PCTempMouseControllerState.WHEELDN = 1;
|
PCTempMouseControllerState.WHEELDN = 1;
|
||||||
|
|
||||||
|
PSGLOBAL(lastMousePos.x) = xpos;
|
||||||
|
PSGLOBAL(lastMousePos.y) = ypos;
|
||||||
|
PSGLOBAL(mouseWheel) = 0.0f;
|
||||||
|
|
||||||
OldMouseControllerState = NewMouseControllerState;
|
OldMouseControllerState = NewMouseControllerState;
|
||||||
NewMouseControllerState = PCTempMouseControllerState;
|
NewMouseControllerState = PCTempMouseControllerState;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user