mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Make sure the mouse is captured when the main menu transitions into MODE_GAME. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@4776 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
c42516c579
commit
f2fc1a6f15
2 changed files with 4 additions and 1 deletions
|
@ -178,7 +178,7 @@ const char *getjoyname(int32_t what, int32_t num)
|
||||||
|
|
||||||
static inline char grabmouse_low(char a)
|
static inline char grabmouse_low(char a)
|
||||||
{
|
{
|
||||||
#if (!defined DEBUGGINGAIDS || defined __APPLE__)
|
#if (!defined DEBUGGINGAIDS || defined _WIN32 || defined __APPLE__)
|
||||||
SDL_ShowCursor(a ? SDL_DISABLE : SDL_ENABLE);
|
SDL_ShowCursor(a ? SDL_DISABLE : SDL_ENABLE);
|
||||||
return (SDL_WM_GrabInput(a ? SDL_GRAB_ON : SDL_GRAB_OFF) != (a ? SDL_GRAB_ON : SDL_GRAB_OFF));
|
return (SDL_WM_GrabInput(a ? SDL_GRAB_ON : SDL_GRAB_OFF) != (a ? SDL_GRAB_ON : SDL_GRAB_OFF));
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -1906,7 +1906,10 @@ int32_t G_EnterLevel(int32_t g)
|
||||||
if (g & (MODE_GAME|MODE_EOL))
|
if (g & (MODE_GAME|MODE_EOL))
|
||||||
{
|
{
|
||||||
for (TRAVERSE_CONNECT(i))
|
for (TRAVERSE_CONNECT(i))
|
||||||
|
{
|
||||||
g_player[i].ps->gm = MODE_GAME;
|
g_player[i].ps->gm = MODE_GAME;
|
||||||
|
M_CloseMenu(i);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (g & MODE_RESTART)
|
else if (g & MODE_RESTART)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue