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/client/cl_scrn.c | |
| 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/client/cl_scrn.c')
| -rw-r--r-- | src/client/cl_scrn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client/cl_scrn.c b/src/client/cl_scrn.c index 1f2f60bf..0c3a1187 100644 --- a/src/client/cl_scrn.c +++ b/src/client/cl_scrn.c @@ -458,7 +458,7 @@ void SCR_DrawScreenField( stereoFrame_t stereoFrame ) { re.BeginFrame( stereoFrame ); - uiFullscreen = (uivm && VM_Call( uivm, UI_IS_FULLSCREEN )); + uiFullscreen = (uivm && VM_Call( uivm, UI_IS_FULLSCREEN - ( uiInterface == 2 ? 2 : 0 ) )); // wide aspect ratio screens need to have the sides cleared // unless they are displaying game renderings @@ -483,15 +483,15 @@ void SCR_DrawScreenField( stereoFrame_t stereoFrame ) { case CA_DISCONNECTED: // force menu up S_StopAllSounds(); - VM_Call( uivm, UI_SET_ACTIVE_MENU, UIMENU_MAIN ); + VM_Call( uivm, UI_SET_ACTIVE_MENU - ( uiInterface == 2 ? 2 : 0 ), UIMENU_MAIN ); break; case CA_CONNECTING: case CA_CHALLENGING: case CA_CONNECTED: // connecting clients will only show the connection dialog // refresh to update the time - VM_Call( uivm, UI_REFRESH, cls.realtime ); - VM_Call( uivm, UI_DRAW_CONNECT_SCREEN, qfalse ); + VM_Call( uivm, UI_REFRESH - ( uiInterface == 2 ? 2 : 0 ), cls.realtime ); + VM_Call( uivm, UI_DRAW_CONNECT_SCREEN - ( uiInterface == 2 ? 2 : 0 ), qfalse ); break; case CA_LOADING: case CA_PRIMED: @@ -510,7 +510,7 @@ void SCR_DrawScreenField( stereoFrame_t stereoFrame ) { // the menu draws next if ( Key_GetCatcher( ) & KEYCATCH_UI && uivm ) { - VM_Call( uivm, UI_REFRESH, cls.realtime ); + VM_Call( uivm, UI_REFRESH - ( uiInterface == 2 ? 2 : 0 ), cls.realtime ); } // console draws next |