summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-16 22:43:35 +0100
committeraap <aap@papnet.eu>2020-11-16 22:43:35 +0100
commit46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44 (patch)
tree0ba07eade718824f6384d9baabf733f9752410ef /src/core
parentanimation compression from PS2 (diff)
parentpragma twice (diff)
downloadre3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.tar
re3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.tar.gz
re3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.tar.bz2
re3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.tar.lz
re3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.tar.xz
re3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.tar.zst
re3-46253fbf7d2a1b0cf9d2f0ab5f7e79035a997b44.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Frontend.cpp12
-rw-r--r--src/core/main.cpp4
2 files changed, 13 insertions, 3 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 4be23b77..b84b691d 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -5433,6 +5433,10 @@ CMenuManager::SetHelperText(int text)
void
CMenuManager::ShutdownJustMenu()
{
+ // In case we're windowed, keep mouse centered while in game. Done in main.cpp in other conditions.
+#if defined(RW_GL3) && defined(IMPROVED_VIDEOMODE)
+ glfwSetInputMode(PSGLOBAL(window), GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+#endif
m_bMenuActive = false;
CTimer::EndUserPause();
}
@@ -5529,8 +5533,14 @@ CMenuManager::SwitchMenuOnAndOff()
gMusicPlaying = 0;
}
*/
- if (m_bMenuActive != menuWasActive)
+ if (m_bMenuActive != menuWasActive) {
m_bMenuStateChanged = true;
+
+ // In case we're windowed, keep mouse centered while in game. Done in main.cpp in other conditions.
+#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;
diff --git a/src/core/main.cpp b/src/core/main.cpp
index cd234588..157776e0 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -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;