X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cl_screen.c;h=eb2c10314e3edd6dd149c4316960a821d6664464;hb=bdf21080ff2db3ff0c4d14c774f0b4d0f147b720;hp=312c68e2f56b8cb6403b585b59aa58bfb1864caa;hpb=28b6442c3d8b337e36a8b402c55b47696fb9085a;p=xonotic%2Fdarkplaces.git diff --git a/cl_screen.c b/cl_screen.c index 312c68e2..eb2c1031 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -42,7 +42,7 @@ cvar_t scr_loadingscreen_background = {CVAR_CLIENT, "scr_loadingscreen_backgroun cvar_t scr_loadingscreen_scale = {CVAR_CLIENT, "scr_loadingscreen_scale","1", "scale factor of the background"}; cvar_t scr_loadingscreen_scale_base = {CVAR_CLIENT, "scr_loadingscreen_scale_base","0", "0 = console pixels, 1 = video pixels"}; cvar_t scr_loadingscreen_scale_limit = {CVAR_CLIENT, "scr_loadingscreen_scale_limit","0", "0 = no limit, 1 = until first edge hits screen edge, 2 = until last edge hits screen edge, 3 = until width hits screen width, 4 = until height hits screen height"}; -cvar_t scr_loadingscreen_picture = {CVAR_CLIENT | CVAR_SAVE, "scr_loadingscreen_picture", "gfx/loading", "picture shown during loading"}; +cvar_t scr_loadingscreen_picture = {CVAR_CLIENT, "scr_loadingscreen_picture", "gfx/loading", "picture shown during loading"}; cvar_t scr_loadingscreen_count = {CVAR_CLIENT, "scr_loadingscreen_count","1", "number of loading screen files to use randomly (named loading.tga, loading2.tga, loading3.tga, ...)"}; cvar_t scr_loadingscreen_firstforstartup = {CVAR_CLIENT, "scr_loadingscreen_firstforstartup","0", "remove loading.tga from random scr_loadingscreen_count selection and only display it on client startup, 0 = normal, 1 = firstforstartup"}; cvar_t scr_loadingscreen_barcolor = {CVAR_CLIENT, "scr_loadingscreen_barcolor", "0 0 1", "rgb color of loadingscreen progress bar"}; @@ -85,7 +85,7 @@ cvar_t r_stereo_angle = {CVAR_CLIENT, "r_stereo_angle", "0", "separation angle o cvar_t scr_stipple = {CVAR_CLIENT, "scr_stipple", "0", "interlacing-like stippling of the display"}; cvar_t scr_refresh = {CVAR_CLIENT, "scr_refresh", "1", "allows you to completely shut off rendering for benchmarking purposes"}; cvar_t scr_screenshot_name_in_mapdir = {CVAR_CLIENT | CVAR_SAVE, "scr_screenshot_name_in_mapdir", "0", "if set to 1, screenshots are placed in a subdirectory named like the map they are from"}; -cvar_t shownetgraph = {CVAR_CLIENT | CVAR_SAVE, "shownetgraph", "0", "shows a graph of packet sizes and other information, 0 = off, 1 = show client netgraph, 2 = show client and server netgraphs (when hosting a server)"}; +cvar_t net_graph = {CVAR_CLIENT | CVAR_SAVE, "net_graph", "0", "shows a graph of packet sizes and other information, 0 = off, 1 = show client netgraph, 2 = show client and server netgraphs (when hosting a server)"}; cvar_t cl_demo_mousegrab = {CVAR_CLIENT, "cl_demo_mousegrab", "0", "Allows reading the mouse input while playing demos. Useful for camera mods developed in csqc. (0: never, 1: always)"}; cvar_t timedemo_screenshotframelist = {CVAR_CLIENT, "timedemo_screenshotframelist", "", "when performing a timedemo, take screenshots of each frame in this space-separated list - example: 1 201 401"}; cvar_t vid_touchscreen_outlinealpha = {CVAR_CLIENT, "vid_touchscreen_outlinealpha", "0", "opacity of touchscreen area outlines"}; @@ -125,6 +125,8 @@ int scr_con_margin_bottom; extern int con_vislines; +extern int cl_punchangle_applied; + static void SCR_ScreenShot_f(cmd_state_t *cmd); static void R_Envmap_f(cmd_state_t *cmd); @@ -334,7 +336,7 @@ static void SCR_DrawNetGraph (void) return; if (!cls.netcon) return; - if (!shownetgraph.integer) + if (!net_graph.integer) return; separator1 = 2; @@ -343,7 +345,7 @@ static void SCR_DrawNetGraph (void) graphwidth = 120; graphheight = 70; graphscale = 1.0f / 1500.0f; - graphlimit = rate.integer; + graphlimit = cl_rate.integer; netgraphsperrow = (vid_conwidth.integer + separator2) / (graphwidth * 2 + separator1 + separator2); netgraphsperrow = max(netgraphsperrow, 1); @@ -356,7 +358,7 @@ static void SCR_DrawNetGraph (void) SCR_DrawNetGraph_DrawGraph(netgraph_x + graphwidth + separator1, netgraph_y, graphwidth, graphheight, graphscale, graphlimit, "outgoing", textsize, c->outgoing_packetcounter, c->outgoing_netgraph); index++; - if (sv.active && shownetgraph.integer >= 2) + if (sv.active && net_graph.integer >= 2) { for (i = 0;i < svs.maxclients;i++) { @@ -1347,7 +1349,8 @@ void CL_Screen_Init(void) Cvar_RegisterVariable(&r_stereo_angle); Cvar_RegisterVariable(&scr_stipple); Cvar_RegisterVariable(&scr_refresh); - Cvar_RegisterVariable(&shownetgraph); + Cvar_RegisterVariable(&net_graph); + Cvar_RegisterAlias(&net_graph, "shownetgraph"); Cvar_RegisterVariable(&cl_demo_mousegrab); Cvar_RegisterVariable(&timedemo_screenshotframelist); Cvar_RegisterVariable(&vid_touchscreen_outlinealpha); @@ -1489,7 +1492,7 @@ void SCR_ScreenShot_f(cmd_state_t *cmd) Con_Printf("Wrote %s\n", filename); else { - Con_Errorf("Unable to write %s\n", filename); + Con_Printf(CON_ERROR "Unable to write %s\n", filename); if(jpeg || png) { if(SCR_ScreenShot (filename, buffer1, buffer2, 0, 0, vid.width, vid.height, false, false, false, false, false, true, scr_screenshot_alpha.integer != 0)) @@ -2257,6 +2260,11 @@ static void SCR_DrawScreen (void) if ((key_dest == key_game || key_dest == key_message) && !r_letterbox.value && !scr_loading) Con_DrawNotify (); // only draw notify in game + if (cl.islocalgame && key_dest != key_game || key_consoleactive) + host.paused = true; + else + host.paused = false; + if (cls.signon == SIGNONS) { SCR_DrawNet (); @@ -2623,7 +2631,7 @@ void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup) #ifdef USE_GLES2 SCR_DrawLoadingScreen_SharedSetup(clear); - SCR_DrawLoadingScreen(clear); + SCR_DrawLoadingScreen(); #else SCR_DrawLoadingScreen_SharedSetup(clear); if (vid.stereobuffer) @@ -2718,6 +2726,9 @@ void CL_UpdateScreen(void) double drawscreendelta; r_viewport_t viewport; + // TODO: Move to a better place. + cl_punchangle_applied = 0; + if(drawscreenstart) { drawscreendelta = Sys_DirtyTime() - drawscreenstart;