ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-25 22:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

centers cursor with raw input in popup menu. half-working fix for OS cursor displaying over game cursor (reappears after esc menu is opened).

Browse source
This commit is contained in:
pierow 2018-06-06 18:54:37 -04:00
parent ca37f785ec
commit 38e748c26a
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main/source/mod/AvHPieMenuHandler.cpp
View file

@ -44,6 +44,7 @@
#include "AvHCommandConstants.h"
#include "../engine/cdll_int.h"
#include "../types.h"
#include <SDL2/SDL_mouse.h>
#include <string>
using std::string;
@ -118,7 +119,7 @@ void AvHPieMenuHandler::ClosePieMenu(void)
// Reset the mouse cursor to the center of the screen so
// that the view doesn't jog once the pie menu is closed.
IN_ResetMouse();
gHUD.ShowCrosshair();
@ -136,6 +137,8 @@ void AvHPieMenuHandler::InternalClosePieMenu(void)
if(!gHUD.GetInTopDownMode())
{
gHUD.GetManager().SetMouseVisibility(false);
//attempt at fixing OS cursor appearing over game's cursor
ShowCursor(TRUE);
}
theMarineMenu->SetFadeState(false);
@ -145,6 +148,11 @@ void AvHPieMenuHandler::InternalClosePieMenu(void)
}
sLastNodeHighlighted = NULL;
if (CVAR_GET_FLOAT("m_rawinput") != 0)
{
SDL_SetRelativeMouseMode(SDL_TRUE);
}
// if(sTheDebugBool)
// {
// AvHTeamHierarchy* theHierarchyComponent = NULL;
@ -175,10 +183,21 @@ void AvHPieMenuHandler::OpenPieMenu(void)
if(!gHUD.GetInTopDownMode())
{
gHUD.GetManager().SetMouseVisibility(true);
//attempt at fixing OS cursor appearing over game's cursor
ShowCursor(FALSE);
}
gHUD.HideCrosshair();
if (CVAR_GET_FLOAT("m_rawinput") != 0)
{
SDL_SetRelativeMouseMode(SDL_FALSE);
gEngfuncs.pfnSetMousePos(gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY());
}
//App::getInstance()->setCursorOveride(App::getInstance()->getScheme()->getCursor(Scheme::scu_none));
//App::getInstance()->setCursorOveride(gHUD.GetManager().mBlankCursor);
// Only do this when in full screen
//App::getInstance()->setCursorPos(ScreenWidth/2, ScreenHeight/2);
@ -189,7 +208,7 @@ void AvHPieMenuHandler::OpenPieMenu(void)
sTimeLastNodeHighlighted = sTimeMenuOpened;
sPieMenuOpen = true;
// if(sTheDebugBool)
// {
// AvHTeamHierarchy* theHierarchyComponent = NULL;