mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-17 02:59:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix mouse lock/high-dpi

Browse source
This commit is contained in:
erorcun 2020-11-16 15:28:10 +03:00
commit 3b1debaa0d
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/Frontend.cpp
View file

@ -5529,8 +5529,15 @@ CMenuManager::SwitchMenuOnAndOff()
gMusicPlaying = 0;
}
*/
if (m_bMenuActive != menuWasActive)
if (m_bMenuActive != menuWasActive) {
m_bMenuStateChanged = true;
// Keep mouse centered while in game. Done in main.cpp in other conditions.
// IMPROVED_VIDEOMODE because otherwise there is no way for windowed mode.
#if defined(RW_GL3) && defined(IMPROVED_VIDEOMODE)
glfwSetInputMode(PSGLOBAL(window), GLFW_CURSOR, m_bMenuActive && m_nPrefsWindowed ? GLFW_CURSOR_HIDDEN : GLFW_CURSOR_DISABLED);
#endif
}
m_bStartUpFrontEndRequested = false;
m_bShutDownFrontEndRequested = false;

4
src/core/main.cpp
View file

@ -1090,9 +1090,9 @@ Idle(void *arg)
if((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu) &&
TheCamera.GetScreenFadeStatus() != FADE_2)
{
#ifdef GTA_PC
// This is from SA, but it's nice for windowed mode
#if defined(GTA_PC) && !defined(RW_GL3)
if (!FrontEndMenuManager.m_bRenderGameInMenu) {
// This is from SA, but it's nice for windowed mode
RwV2d pos;
pos.x = SCREEN_WIDTH / 2.0f;
pos.y = SCREEN_HEIGHT / 2.0f;