diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-02-08 13:55:15 +0100 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-03-09 13:51:18 +0100 |
| commit | b392b0d97f3ea048478059873ed6dec8afd9634b (patch) | |
| tree | e3fb4a9ef70d89bfb70676fe33f9b493da7051ec /src/sdl | |
| parent | 65bcf419d4b612b7d626447924fa0fe2079c18c2 (diff) | |
implement part 1 of the multi-protocol functionality: protocols
this contains support for connecting via, and serving simultaneously via, any of the three protocols: latest, GPP and 1.1
alternate-1 means protocol 70 (GPP), alternate-2 means protocol 69 (1.1)
relevant cvars:
- net_alternateProtocols
- net_alt{1|2}port[6]
- sv_alt{1|2}master{1|...|5}
- sv_clAltProto{0|..|63}
Diffstat (limited to 'src/sdl')
| -rw-r--r-- | src/sdl/sdl_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c index 2cbdfe9a..e3ae9efc 100644 --- a/src/sdl/sdl_input.c +++ b/src/sdl/sdl_input.c @@ -416,7 +416,7 @@ static void IN_DeactivateMouse( void ) SDL_SetRelativeMouseMode( SDL_FALSE ); // Don't warp the mouse unless the cursor is within the window - if( SDL_GetWindowFlags( SDL_window ) & SDL_WINDOW_MOUSE_FOCUS ) + if( SDL_GetWindowFlags( SDL_window ) & SDL_WINDOW_MOUSE_FOCUS && uiInterface != 2 ) { int x, y; IN_GetUIMousePosition( &x, &y ); @@ -956,7 +956,7 @@ void IN_Frame( void ) // Loading in windowed mode IN_DeactivateMouse( ); } - else if( !cls.glconfig.isFullscreen && cursorShowing ) + else if( !cls.glconfig.isFullscreen && cursorShowing && uiInterface != 2 ) { // Use WM cursor when not fullscreen IN_DeactivateMouse( ); @@ -969,7 +969,7 @@ void IN_Frame( void ) else IN_ActivateMouse( ); - if( !mouseActive ) + if( !mouseActive && uiInterface != 2 ) { SDL_GetMouseState( &x, &y ); IN_SetUIMousePosition( x, y ); |