]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_screen.c
modified gamma handling, now VID_UpdateGamma is only called from VID_Finish, and...
[xonotic/darkplaces.git] / cl_screen.c
index f9f4fe2219543442624467fb83b5bf1fbadd2507..4e944b2338ddd3bf0d719aa683888111373b8eb9 100644 (file)
@@ -1,34 +1,47 @@
 
 #include "quakedef.h"
 #include "cl_video.h"
+#include "image.h"
 #include "jpeg.h"
 #include "cl_collision.h"
+#include "csprogs.h"
+
+cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100", "how large the view should be, 110 disables inventory bar, 120 disables status bar"};
+cvar_t scr_fov = {CVAR_SAVE, "fov","90", "field of vision, 1-170 degrees, default 90, some players use 110-130"};      // 1 - 170
+cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900", "speed of console open/close"}; // LordHavoc: quake used 300
+cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1", "opacity of console background"};
+cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2", "brightness of console background (0 = black, 1 = image)"};
+cvar_t scr_conforcewhiledisconnected = {0, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"};
+cvar_t scr_menuforcewhiledisconnected = {0, "scr_menuforcewhiledisconnected", "1", "forces menu while disconnected"};
+cvar_t scr_centertime = {0, "scr_centertime","2", "how long centerprint messages show"};
+cvar_t scr_showram = {CVAR_SAVE, "showram","1", "show ram icon if low on surface cache memory (not used)"};
+cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0", "show turtle icon when framerate is too low (not used)"};
+cvar_t scr_showpause = {CVAR_SAVE, "showpause","1", "show pause icon when game is paused"};
+cvar_t scr_showbrand = {0, "showbrand","0", "shows gfx/brand.tga in a corner of the screen (different values select different positions, including centered)"};
+cvar_t scr_printspeed = {0, "scr_printspeed","8", "speed of intermission printing (episode end texts)"};
+cvar_t vid_conwidth = {CVAR_SAVE, "vid_conwidth", "640", "virtual width of 2D graphics system"};
+cvar_t vid_conheight = {CVAR_SAVE, "vid_conheight", "480", "virtual height of 2D graphics system"};
+cvar_t vid_pixelheight = {CVAR_SAVE, "vid_pixelheight", "1", "adjusts vertical field of vision to account for non-square pixels (1280x1024 on a CRT monitor for example)"};
+cvar_t scr_screenshot_jpeg = {CVAR_SAVE, "scr_screenshot_jpeg","1", "save jpeg instead of targa"};
+cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality","0.9", "image quality of saved jpeg"};
+cvar_t scr_screenshot_gamma = {CVAR_SAVE, "scr_screenshot_gamma","2.2", "gamma correction on saved screenshots and videos, 1.0 saves unmodified images"};
+// scr_screenshot_name is defined in fs.c
+cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a file or files (default is .tga files, if scr_screenshot_jpeg is on it saves .jpg files (VERY SLOW), if any rawrgb or rawyv12 are on it saves those formats instead, note that scr_screenshot_gamma affects the brightness of the output)"};
+cvar_t cl_capturevideo_sound = {0, "cl_capturevideo_sound", "0", "enables saving of sound to a .wav file (warning: this requires exact sync, if your hard drive can't keep up it will abort, if your graphics can't keep up it will save duplicate frames to maintain sound sync)"};
+cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30", "how many frames per second to save (29.97 for NTSC, 30 for typical PC video, 15 can be useful)"};
+cvar_t cl_capturevideo_rawrgb = {0, "cl_capturevideo_rawrgb", "0", "saves a single .rgb video file containing raw RGB images (you'll need special processing tools to encode this to something more useful)"};
+cvar_t cl_capturevideo_rawyv12 = {0, "cl_capturevideo_rawyv12", "0", "saves a single .yv12 video file containing raw YV12 (luma plane, then half resolution chroma planes, first chroma blue then chroma red, this is the format used internally by many encoders, some tools can read it directly)"};
+cvar_t r_letterbox = {0, "r_letterbox", "0", "reduces vertical height of view to simulate a letterboxed movie effect (can be used by mods for cutscenes)"};
+cvar_t r_stereo_separation = {0, "r_stereo_separation", "4", "separation of eyes in the world (try negative values too)"};
+cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views (for those who can't afford glasses but can afford eye strain)"};
+cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0", "red/blue anaglyph stereo glasses (note: most of these glasses are actually red/cyan, try that one too)"};
+cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0", "red/cyan anaglyph stereo glasses, the kind given away at drive-in movies like Creature From The Black Lagoon In 3D"};
+cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0", "red/green anaglyph stereo glasses (for those who don't mind yellow)"};
+cvar_t scr_zoomwindow = {CVAR_SAVE, "scr_zoomwindow", "0", "displays a zoomed in overlay window"};
+cvar_t scr_zoomwindow_viewsizex = {CVAR_SAVE, "scr_zoomwindow_viewsizex", "20", "horizontal viewsize of zoom window"};
+cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20", "vertical viewsize of zoom window"};
+cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom window"};
 
-cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100"};
-cvar_t scr_fov = {CVAR_SAVE, "fov","90"};      // 1 - 170
-cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900"}; // LordHavoc: quake used 300
-cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
-cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2"};
-cvar_t scr_conforcewhiledisconnected = {CVAR_SAVE, "scr_conforcewhiledisconnected", "1"};
-cvar_t scr_centertime = {0, "scr_centertime","2"};
-cvar_t scr_showram = {CVAR_SAVE, "showram","1"};
-cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0"};
-cvar_t scr_showpause = {CVAR_SAVE, "showpause","1"};
-cvar_t scr_printspeed = {0, "scr_printspeed","8"};
-cvar_t vid_conwidth = {CVAR_SAVE, "vid_conwidth", "640"};
-cvar_t vid_conheight = {CVAR_SAVE, "vid_conheight", "480"};
-cvar_t vid_pixelaspect = {CVAR_SAVE, "vid_pixelaspect", "1"};
-cvar_t scr_screenshot_jpeg = {CVAR_SAVE, "scr_screenshot_jpeg","0"};
-cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality","0.9"};
-cvar_t scr_screenshot_gamma = {CVAR_SAVE, "scr_screenshot_gamma","2.2"};
-cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"};
-cvar_t cl_capturevideo = {0, "cl_capturevideo", "0"};
-cvar_t cl_capturevideo_sound = {0, "cl_capturevideo_sound", "0"};
-cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30"};
-cvar_t cl_capturevideo_rawrgb = {0, "cl_capturevideo_rawrgb", "0"};
-cvar_t cl_capturevideo_rawyv12 = {0, "cl_capturevideo_rawyv12", "0"};
-cvar_t r_textshadow = {0, "r_textshadow", "0"};
-cvar_t r_letterbox = {0, "r_letterbox", "0"};
 
 int jpeg_supported = false;
 
@@ -45,114 +58,6 @@ static void R_Envmap_f (void);
 // backend
 void R_ClearScreen(void);
 
-// color tag printing
-static vec4_t string_colors[] =
-{
-       // Quake3 colors
-       // LordHavoc: why on earth is cyan before magenta in Quake3?
-       // LordHavoc: note: Doom3 uses white for [0] and [7]
-       {0.0, 0.0, 0.0, 1.0}, // black
-       {1.0, 0.0, 0.0, 1.0}, // red
-       {0.0, 1.0, 0.0, 1.0}, // green
-       {1.0, 1.0, 0.0, 1.0}, // yellow
-       {0.0, 0.0, 1.0, 1.0}, // blue
-       {0.0, 1.0, 1.0, 1.0}, // cyan
-       {1.0, 0.0, 1.0, 1.0}, // magenta
-       {1.0, 1.0, 1.0, 1.0}, // white
-       // [515]'s BX_COLOREDTEXT extension
-       {1.0, 1.0, 1.0, 0.5}, // half transparent
-       {0.5, 0.5, 0.5, 1.0}  // half brightness
-       // Black's color table
-       //{1.0, 1.0, 1.0, 1.0},
-       //{1.0, 0.0, 0.0, 1.0},
-       //{0.0, 1.0, 0.0, 1.0},
-       //{0.0, 0.0, 1.0, 1.0},
-       //{1.0, 1.0, 0.0, 1.0},
-       //{0.0, 1.0, 1.0, 1.0},
-       //{1.0, 0.0, 1.0, 1.0},
-       //{0.1, 0.1, 0.1, 1.0}
-};
-
-#define STRING_COLORS_COUNT    (sizeof(string_colors) / sizeof(vec4_t))
-
-// color is read and changed in the end
-void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor )
-{
-       vec_t *color;
-       int len;
-       int colorindex;
-       const char *start, *current;
-
-       if( !outcolor || *outcolor == -1 ) {
-               colorindex = STRING_COLOR_DEFAULT;
-       } else {
-               colorindex = *outcolor;
-       }
-       color = string_colors[colorindex];
-
-       if( maxlen < 1)
-               len = (int)strlen( text );
-       else
-               len = min( maxlen, (int) strlen( text ) );
-
-       start = current = text;
-       while( len > 0 ) {
-               // check for color control char
-               if( *current == STRING_COLOR_TAG ) {
-                       // get next char
-                       current++;
-                       len--;
-                       if( len == 0 ) {
-                               break;
-                       }
-                       // display the tag char?
-                       if( *current == STRING_COLOR_TAG ) {
-                               // only display one of the two
-                               start = current;
-                               // get the next char
-                               current++;
-                               len--;
-                       } else if( '0' <= *current && *current <= '9' ) {
-                               colorindex = 0;
-                               do {
-                                       colorindex = colorindex * 10 + (*current - '0');
-                                       // only read as long as it makes a valid index
-                                       if( colorindex >= (int)STRING_COLORS_COUNT ) {
-                                               // undo the last operation
-                                               colorindex /= 10;
-                                               break;
-                                       }
-                                       current++;
-                                       len--;
-                               } while( len > 0 && '0' <= *current && *current <= '9' );
-                               // set the color
-                               color = string_colors[colorindex];
-                               // we jump over the color tag
-                               start = current;
-                       }
-               }
-               // go on and read normal text in until the next control char
-               while( len > 0 && *current != STRING_COLOR_TAG ) {
-                       current++;
-                       len--;
-               }
-               // display the text
-               if( start != current ) {
-                       // draw the string
-                       DrawQ_String( x, y, start, current - start, scalex, scaley, basered * color[0], basegreen * color[1], baseblue * color[2], basealpha * color[3], flags );
-                       // update x to be at the new start position
-                       x += (current - start) * scalex;
-                       // set start accordingly
-                       start = current;
-               }
-       }
-
-       // return the last colorindex
-       if( outcolor ) {
-               *outcolor = colorindex;
-       }
-}
-
 /*
 ===============================================================================
 
@@ -161,7 +66,7 @@ CENTER PRINTING
 ===============================================================================
 */
 
-char           scr_centerstring[1024];
+char           scr_centerstring[MAX_INPUTLINE];
 float          scr_centertime_start;   // for slow victory printing
 float          scr_centertime_off;
 int                    scr_center_lines;
@@ -199,6 +104,7 @@ void SCR_DrawCenterString (void)
        int             l;
        int             x, y;
        int             remaining;
+       int             color;
 
 // the finale prints the characters one at a time
        if (cl.intermission)
@@ -209,11 +115,15 @@ void SCR_DrawCenterString (void)
        scr_erase_center = 0;
        start = scr_centerstring;
 
+       if (remaining < 1)
+               return;
+
        if (scr_center_lines <= 4)
                y = vid_conheight.integer*0.35;
        else
                y = 48;
 
+       color = -1;
        do
        {
        // scan the width of the line
@@ -225,7 +135,7 @@ void SCR_DrawCenterString (void)
                {
                        if (remaining < l)
                                l = remaining;
-                       DrawQ_String(x, y, start, l, 8, 8, 1, 1, 1, 1, 0);
+                       DrawQ_ColoredString(x, y, start, l, 8, 8, 1, 1, 1, 1, 0, &color);
                        remaining -= l;
                        if (remaining <= 0)
                                return;
@@ -286,7 +196,7 @@ void SCR_DrawTurtle (void)
        if (count < 3)
                return;
 
-       DrawQ_Pic (0, 0, "gfx/turtle", 0, 0, 1, 1, 1, 1, 0);
+       DrawQ_Pic (0, 0, Draw_CachePic("gfx/turtle", true), 0, 0, 1, 1, 1, 1, 0);
 }
 
 /*
@@ -303,7 +213,7 @@ void SCR_DrawNet (void)
        if (cls.demoplayback)
                return;
 
-       DrawQ_Pic (64, 0, "gfx/net", 0, 0, 1, 1, 1, 1, 0);
+       DrawQ_Pic (64, 0, Draw_CachePic("gfx/net", true), 0, 0, 1, 1, 1, 1, 0);
 }
 
 /*
@@ -325,12 +235,85 @@ void SCR_DrawPause (void)
                return;
 
        pic = Draw_CachePic ("gfx/pause", true);
-       DrawQ_Pic ((vid_conwidth.integer - pic->width)/2, (vid_conheight.integer - pic->height)/2, "gfx/pause", 0, 0, 1, 1, 1, 1, 0);
+       DrawQ_Pic ((vid_conwidth.integer - pic->width)/2, (vid_conheight.integer - pic->height)/2, pic, 0, 0, 1, 1, 1, 1, 0);
 }
 
+/*
+==============
+SCR_DrawBrand
+==============
+*/
+void SCR_DrawBrand (void)
+{
+       cachepic_t      *pic;
+       float           x, y;
+
+       if (!scr_showbrand.value)
+               return;
+
+       pic = Draw_CachePic ("gfx/brand", true);
 
+       switch ((int)scr_showbrand.value)
+       {
+       case 1: // bottom left
+               x = 0;
+               y = vid_conheight.integer - pic->height;
+               break;
+       case 2: // bottom centre
+               x = (vid_conwidth.integer - pic->width) / 2;
+               y = vid_conheight.integer - pic->height;
+               break;
+       case 3: // bottom right
+               x = vid_conwidth.integer - pic->width;
+               y = vid_conheight.integer - pic->height;
+               break;
+       case 4: // centre right
+               x = vid_conwidth.integer - pic->width;
+               y = (vid_conheight.integer - pic->height) / 2;
+               break;
+       case 5: // top right
+               x = vid_conwidth.integer - pic->width;
+               y = 0;
+               break;
+       case 6: // top centre
+               x = (vid_conwidth.integer - pic->width) / 2;
+               y = 0;
+               break;
+       case 7: // top left
+               x = 0;
+               y = 0;
+               break;
+       case 8: // centre left
+               x = 0;
+               y = (vid_conheight.integer - pic->height) / 2;
+               break;
+       default:
+               return;
+       }
 
+       DrawQ_Pic (x, y, pic, 0, 0, 1, 1, 1, 1, 0);
+}
 
+/*
+==============
+SCR_DrawDownload
+==============
+*/
+static void SCR_DrawDownload(void)
+{
+       int len;
+       float x, y;
+       float size = 8;
+       char temp[256];
+       if (!cls.qw_downloadname[0])
+               return;
+       dpsnprintf(temp, sizeof(temp), "Downloading %s ...  %3i%%\n", cls.qw_downloadname, cls.qw_downloadpercent);
+       len = (int)strlen(temp);
+       x = (vid_conwidth.integer - len*size) / 2;
+       y = vid_conheight.integer - size;
+       DrawQ_Pic(0, y, NULL, vid_conwidth.integer, size, 0, 0, 0, 0.5, 0);
+       DrawQ_String(x, y, temp, len, size, size, 1, 1, 1, 1, 0);
+}
 
 //=============================================================================
 
@@ -344,10 +327,21 @@ void SCR_SetUpToDrawConsole (void)
 {
        // lines of console to display
        float conlines;
+       static int framecounter = 0;
 
        Con_CheckResize ();
 
-       if (key_dest == key_game && cls.signon != SIGNONS && scr_conforcewhiledisconnected.integer)
+       if (scr_menuforcewhiledisconnected.integer && key_dest == key_game && cls.state == ca_disconnected)
+       {
+               if (framecounter >= 2)
+                       MR_ToggleMenu_f();
+               else
+                       framecounter++;
+       }
+       else
+               framecounter = 0;
+
+       if (scr_conforcewhiledisconnected.integer && key_dest == key_game && cls.signon != SIGNONS)
                key_consoleactive |= KEY_CONSOLEACTIVE_FORCED;
        else
                key_consoleactive &= ~KEY_CONSOLEACTIVE_FORCED;
@@ -408,6 +402,9 @@ SCR_BeginLoadingPlaque
 */
 void SCR_BeginLoadingPlaque (void)
 {
+       // save console log up to this point to log_file if it was set by configs
+       Log_Start();
+
        Host_StartVideo();
        S_StopAllSounds();
        SCR_UpdateLoadingScreen();
@@ -425,98 +422,46 @@ void R_TimeReport(char *desc)
        int length;
        int t;
 
-       if (!r_timereport_active || r_showtrispass)
+       if (r_speeds.integer < 2 || !r_timereport_active)
                return;
 
+       qglFinish();
        r_timereport_temp = r_timereport_current;
        r_timereport_current = Sys_DoubleTime();
-       t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0);
+       t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0 + 0.5);
 
-       dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %s", t, desc);
+       dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %-11s", t, desc);
        length = (int)strlen(tempbuf);
-       while (length < 20)
-               tempbuf[length++] = ' ';
-       tempbuf[length] = 0;
        if (speedstringcount + length > (vid_conwidth.integer / 8))
        {
                strlcat(r_speeds_string, "\n", sizeof(r_speeds_string));
                speedstringcount = 0;
        }
-       // skip the space at the beginning if it's the first on the line
-       if (speedstringcount == 0)
-       {
-               strlcat(r_speeds_string, tempbuf + 1, sizeof(r_speeds_string));
-               speedstringcount = length - 1;
-       }
-       else
-       {
-               strlcat(r_speeds_string, tempbuf, sizeof(r_speeds_string));
-               speedstringcount += length;
-       }
-}
-
-void R_TimeReport_Start(void)
-{
-       r_timereport_active = r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected;
-       r_speeds_string[0] = 0;
-       if (r_timereport_active)
-       {
-               speedstringcount = 0;
-               sprintf(r_speeds_string + strlen(r_speeds_string), "org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n", r_vieworigin[0], r_vieworigin[1], r_vieworigin[2], r_viewforward[0], r_viewforward[1], r_viewforward[2]);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "world:%6i faces%6i nodes%6i leafs%6i dlitwalls\n", c_faces, c_nodes, c_leafs, c_light_polys);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "%5i models%5i bmodels%5i sprites%6i particles%4i dlights\n", c_models, c_bmodels, c_sprites, c_particles, c_dlights);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "%6i modeltris%6i meshs%6i meshtris\n", c_alias_polys, c_meshs, c_meshelements / 3);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "bloom %s: %i copies (%i pixels) %i draws (%i pixels)\n", c_bloom ? "active" : "inactive", c_bloomcopies, c_bloomcopypixels, c_bloomdraws, c_bloomdrawpixels);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "realtime lighting:%4i lights%4i clears%4i scissored\n", c_rt_lights, c_rt_clears, c_rt_scissored);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "dynamic: %6i shadowmeshes%6i shadowtris%6i lightmeshes%6i lighttris\n", c_rt_shadowmeshes, c_rt_shadowtris, c_rt_lightmeshes, c_rt_lighttris);
-               sprintf(r_speeds_string + strlen(r_speeds_string), "precomputed: %6i shadowmeshes%6i shadowtris\n", c_rtcached_shadowmeshes, c_rtcached_shadowtris);
-
-               c_alias_polys = 0;
-               c_light_polys = 0;
-               c_faces = 0;
-               c_nodes = 0;
-               c_leafs = 0;
-               c_models = 0;
-               c_bmodels = 0;
-               c_sprites = 0;
-               c_particles = 0;
-               c_dlights = 0;
-               c_meshs = 0;
-               c_meshelements = 0;
-               c_rt_lights = 0;
-               c_rt_clears = 0;
-               c_rt_scissored = 0;
-               c_rt_shadowmeshes = 0;
-               c_rt_shadowtris = 0;
-               c_rt_lightmeshes = 0;
-               c_rt_lighttris = 0;
-               c_rtcached_shadowmeshes = 0;
-               c_rtcached_shadowtris = 0;
-               c_bloom = 0;
-               c_bloomcopies = 0;
-               c_bloomcopypixels = 0;
-               c_bloomdraws = 0;
-               c_bloomdrawpixels = 0;
-
-               r_timereport_start = Sys_DoubleTime();
-       }
+       strlcat(r_speeds_string, tempbuf, sizeof(r_speeds_string));
+       speedstringcount += length;
 }
 
-void R_TimeReport_End(void)
+void R_TimeReport_Frame(void)
 {
-       r_timereport_current = r_timereport_start;
-       R_TimeReport("total");
+       int i, j, lines, y;
 
-       if (r_timereport_active)
+       if (r_speeds_string[0])
        {
-               int i, j, lines, y;
+               if (r_timereport_active)
+               {
+                       r_timereport_current = r_timereport_start;
+                       R_TimeReport("total");
+               }
+
+               if (r_speeds_string[strlen(r_speeds_string)-1] == '\n')
+                       r_speeds_string[strlen(r_speeds_string)-1] = 0;
                lines = 1;
                for (i = 0;r_speeds_string[i];i++)
                        if (r_speeds_string[i] == '\n')
                                lines++;
                y = vid_conheight.integer - sb_lines - lines * 8;
                i = j = 0;
-               DrawQ_Fill(0, y, vid_conwidth.integer, lines * 8, 0, 0, 0, 0.5, 0);
+               DrawQ_Pic(0, y, NULL, vid_conwidth.integer, lines * 8, 0, 0, 0, 0.5, 0);
                while (r_speeds_string[i])
                {
                        j = i;
@@ -528,6 +473,29 @@ void R_TimeReport_End(void)
                                i++;
                        y += 8;
                }
+               r_speeds_string[0] = 0;
+               r_timereport_active = false;
+       }
+       if (r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected)
+       {
+               speedstringcount = 0;
+               r_speeds_string[0] = 0;
+               r_timereport_active = false;
+               sprintf(r_speeds_string + strlen(r_speeds_string), "org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n", r_vieworigin[0], r_vieworigin[1], r_vieworigin[2], r_viewforward[0], r_viewforward[1], r_viewforward[2]);
+               sprintf(r_speeds_string + strlen(r_speeds_string), "%5i entities%6i surfaces%6i triangles%5i leafs%5i portals%6i particles\n", renderstats.entities, renderstats.entities_surfaces, renderstats.entities_triangles, renderstats.world_leafs, renderstats.world_portals, renderstats.particles);
+               sprintf(r_speeds_string + strlen(r_speeds_string), "%4i lights%4i clears%4i scissored%7i light%7i shadow%7i dynamic\n", renderstats.lights, renderstats.lights_clears, renderstats.lights_scissored, renderstats.lights_lighttriangles, renderstats.lights_shadowtriangles, renderstats.lights_dynamicshadowtriangles);
+               if (renderstats.bloom)
+                       sprintf(r_speeds_string + strlen(r_speeds_string), "rendered%6i meshes%8i triangles bloompixels%8i copied%8i drawn\n", renderstats.meshes, renderstats.meshes_elements / 3, renderstats.bloom_copypixels, renderstats.bloom_drawpixels);
+               else
+                       sprintf(r_speeds_string + strlen(r_speeds_string), "rendered%6i meshes%8i triangles\n", renderstats.meshes, renderstats.meshes_elements / 3);
+
+               memset(&renderstats, 0, sizeof(renderstats));
+
+               if (r_speeds.integer >= 2)
+               {
+                       r_timereport_active = true;
+                       r_timereport_start = r_timereport_current = Sys_DoubleTime();
+               }
        }
 }
 
@@ -564,14 +532,16 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&scr_conalpha);
        Cvar_RegisterVariable (&scr_conbrightness);
        Cvar_RegisterVariable (&scr_conforcewhiledisconnected);
+       Cvar_RegisterVariable (&scr_menuforcewhiledisconnected);
        Cvar_RegisterVariable (&scr_showram);
        Cvar_RegisterVariable (&scr_showturtle);
        Cvar_RegisterVariable (&scr_showpause);
+       Cvar_RegisterVariable (&scr_showbrand);
        Cvar_RegisterVariable (&scr_centertime);
        Cvar_RegisterVariable (&scr_printspeed);
        Cvar_RegisterVariable (&vid_conwidth);
        Cvar_RegisterVariable (&vid_conheight);
-       Cvar_RegisterVariable (&vid_pixelaspect);
+       Cvar_RegisterVariable (&vid_pixelheight);
        Cvar_RegisterVariable (&scr_screenshot_jpeg);
        Cvar_RegisterVariable (&scr_screenshot_jpeg_quality);
        Cvar_RegisterVariable (&scr_screenshot_gamma);
@@ -580,192 +550,25 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&cl_capturevideo_fps);
        Cvar_RegisterVariable (&cl_capturevideo_rawrgb);
        Cvar_RegisterVariable (&cl_capturevideo_rawyv12);
-       Cvar_RegisterVariable (&r_textshadow);
        Cvar_RegisterVariable (&r_letterbox);
-
-       Cmd_AddCommand ("sizeup",SCR_SizeUp_f);
-       Cmd_AddCommand ("sizedown",SCR_SizeDown_f);
-       Cmd_AddCommand ("screenshot",SCR_ScreenShot_f);
-       Cmd_AddCommand ("envmap", R_Envmap_f);
+       Cvar_RegisterVariable(&r_stereo_separation);
+       Cvar_RegisterVariable(&r_stereo_sidebyside);
+       Cvar_RegisterVariable(&r_stereo_redblue);
+       Cvar_RegisterVariable(&r_stereo_redcyan);
+       Cvar_RegisterVariable(&r_stereo_redgreen);
+       Cvar_RegisterVariable(&scr_zoomwindow);
+       Cvar_RegisterVariable(&scr_zoomwindow_viewsizex);
+       Cvar_RegisterVariable(&scr_zoomwindow_viewsizey);
+       Cvar_RegisterVariable(&scr_zoomwindow_fov);
+
+       Cmd_AddCommand ("sizeup",SCR_SizeUp_f, "increase view size (increases viewsize cvar)");
+       Cmd_AddCommand ("sizedown",SCR_SizeDown_f, "decrease view size (decreases viewsize cvar)");
+       Cmd_AddCommand ("screenshot",SCR_ScreenShot_f, "takes a screenshot of the next rendered frame");
+       Cmd_AddCommand ("envmap", R_Envmap_f, "render a cubemap (skybox) of the current scene");
 
        scr_initialized = true;
 }
 
-void DrawQ_Clear(void)
-{
-       r_refdef.drawqueuesize = 0;
-}
-
-static int picelements[6] = {0, 1, 2, 0, 2, 3};
-void DrawQ_Pic(float x, float y, const char *picname, float width, float height, float red, float green, float blue, float alpha, int flags)
-{
-       DrawQ_SuperPic(x,y,picname,width,height,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
-}
-
-void DrawQ_String_Real(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
-{
-       int size, len;
-       drawqueue_t *dq;
-       char *out;
-       if (alpha < (1.0f / 255.0f))
-               return;
-       if (maxlen < 1)
-               len = (int)strlen(string);
-       else
-               for (len = 0;len < maxlen && string[len];len++);
-       for (;len > 0 && string[0] == ' ';string++, x += scalex, len--);
-       for (;len > 0 && string[len - 1] == ' ';len--);
-       if (len < 1)
-               return;
-       if (x >= vid_conwidth.integer || y >= vid_conheight.integer || x < (-scalex * len) || y < (-scaley))
-               return;
-       size = sizeof(*dq) + ((len + 1 + 3) & ~3);
-       if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
-               return;
-       red = bound(0, red, 1);
-       green = bound(0, green, 1);
-       blue = bound(0, blue, 1);
-       alpha = bound(0, alpha, 1);
-       dq = (void *)(r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = size;
-       dq->command = DRAWQUEUE_STRING;
-       dq->flags = flags;
-       dq->color = ((unsigned int) (red * 255.0f) << 24) | ((unsigned int) (green * 255.0f) << 16) | ((unsigned int) (blue * 255.0f) << 8) | ((unsigned int) (alpha * 255.0f));
-       dq->x = x;
-       dq->y = y;
-       dq->scalex = scalex;
-       dq->scaley = scaley;
-       out = (char *)(dq + 1);
-       memcpy(out, string, len);
-       out[len] = 0;
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
-{
-       if (r_textshadow.integer)
-               DrawQ_String_Real(x+scalex*0.25,y+scaley*0.25,string,maxlen,scalex,scaley,0,0,0,alpha*0.8,flags);
-
-       DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags);
-}
-
-
-
-void DrawQ_Fill (float x, float y, float w, float h, float red, float green, float blue, float alpha, int flags)
-{
-       DrawQ_SuperPic(x,y,NULL,w,h,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
-}
-
-void DrawQ_SuperPic(float x, float y, const char *picname, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
-{
-       float floats[36];
-       cachepic_t *pic;
-       drawqueuemesh_t mesh;
-       memset(&mesh, 0, sizeof(mesh));
-       if (picname && picname[0])
-       {
-               pic = Draw_CachePic(picname, false);
-               if (width == 0)
-                       width = pic->width;
-               if (height == 0)
-                       height = pic->height;
-               mesh.texture = pic->tex;
-       }
-       mesh.num_triangles = 2;
-       mesh.num_vertices = 4;
-       mesh.data_element3i = picelements;
-       mesh.data_vertex3f = floats;
-       mesh.data_texcoord2f = floats + 12;
-       mesh.data_color4f = floats + 20;
-       memset(floats, 0, sizeof(floats));
-       mesh.data_vertex3f[0] = mesh.data_vertex3f[9] = x;
-       mesh.data_vertex3f[1] = mesh.data_vertex3f[4] = y;
-       mesh.data_vertex3f[3] = mesh.data_vertex3f[6] = x + width;
-       mesh.data_vertex3f[7] = mesh.data_vertex3f[10] = y + height;
-       mesh.data_texcoord2f[0] = s1;mesh.data_texcoord2f[1] = t1;mesh.data_color4f[ 0] = r1;mesh.data_color4f[ 1] = g1;mesh.data_color4f[ 2] = b1;mesh.data_color4f[ 3] = a1;
-       mesh.data_texcoord2f[2] = s2;mesh.data_texcoord2f[3] = t2;mesh.data_color4f[ 4] = r2;mesh.data_color4f[ 5] = g2;mesh.data_color4f[ 6] = b2;mesh.data_color4f[ 7] = a2;
-       mesh.data_texcoord2f[4] = s4;mesh.data_texcoord2f[5] = t4;mesh.data_color4f[ 8] = r4;mesh.data_color4f[ 9] = g4;mesh.data_color4f[10] = b4;mesh.data_color4f[11] = a4;
-       mesh.data_texcoord2f[6] = s3;mesh.data_texcoord2f[7] = t3;mesh.data_color4f[12] = r3;mesh.data_color4f[13] = g3;mesh.data_color4f[14] = b3;mesh.data_color4f[15] = a3;
-       DrawQ_Mesh (&mesh, flags);
-}
-
-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
-{
-       int size;
-       void *p;
-       drawqueue_t *dq;
-       drawqueuemesh_t *m;
-       size = sizeof(*dq);
-       size += sizeof(drawqueuemesh_t);
-       size += sizeof(int[3]) * mesh->num_triangles;
-       size += sizeof(float[3]) * mesh->num_vertices;
-       size += sizeof(float[2]) * mesh->num_vertices;
-       size += sizeof(float[4]) * mesh->num_vertices;
-       if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
-               return;
-       dq = (void *)(r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = size;
-       dq->command = DRAWQUEUE_MESH;
-       dq->flags = flags;
-       dq->color = 0;
-       dq->x = 0;
-       dq->y = 0;
-       dq->scalex = 0;
-       dq->scaley = 0;
-       p = (void *)(dq + 1);
-       m = p;p = (qbyte*)p + sizeof(drawqueuemesh_t);
-       m->num_triangles = mesh->num_triangles;
-       m->num_vertices = mesh->num_vertices;
-       m->texture = mesh->texture;
-       m->data_element3i  = p;memcpy(m->data_element3i , mesh->data_element3i , m->num_triangles * sizeof(int[3]));p = (qbyte*)p + m->num_triangles * sizeof(int[3]);
-       m->data_vertex3f   = p;memcpy(m->data_vertex3f  , mesh->data_vertex3f  , m->num_vertices * sizeof(float[3]));p = (qbyte*)p + m->num_vertices * sizeof(float[3]);
-       m->data_texcoord2f = p;memcpy(m->data_texcoord2f, mesh->data_texcoord2f, m->num_vertices * sizeof(float[2]));p = (qbyte*)p + m->num_vertices * sizeof(float[2]);
-       m->data_color4f    = p;memcpy(m->data_color4f   , mesh->data_color4f   , m->num_vertices * sizeof(float[4]));p = (qbyte*)p + m->num_vertices * sizeof(float[4]);
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_SetClipArea(float x, float y, float width, float height)
-{
-       drawqueue_t * dq;
-       if(r_refdef.drawqueuesize + (int)sizeof(*dq) > r_refdef.maxdrawqueuesize)
-       {
-               Con_DPrint("DrawQueue full !\n");
-               return;
-       }
-       dq = (void*) (r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = sizeof(*dq);
-       dq->command = DRAWQUEUE_SETCLIP;
-       dq->x = x;
-       dq->y = y;
-       dq->scalex = width;
-       dq->scaley = height;
-       dq->flags = 0;
-       dq->color = 0;
-
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_ResetClipArea(void)
-{
-       drawqueue_t *dq;
-       if(r_refdef.drawqueuesize + (int)sizeof(*dq) > r_refdef.maxdrawqueuesize)
-       {
-               Con_DPrint("DrawQueue full !\n");
-               return;
-       }
-       dq = (void*) (r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = sizeof(*dq);
-       dq->command = DRAWQUEUE_RESETCLIP;
-       dq->x = 0;
-       dq->y = 0;
-       dq->scalex = 0;
-       dq->scaley = 0;
-       dq->flags = 0;
-       dq->color = 0;
-
-       r_refdef.drawqueuesize += dq->size;
-}
-
 /*
 ==================
 SCR_ScreenShot_f
@@ -777,9 +580,9 @@ void SCR_ScreenShot_f (void)
        static char oldname[MAX_QPATH];
        char base[MAX_QPATH];
        char filename[MAX_QPATH];
-       qbyte *buffer1;
-       qbyte *buffer2;
-       qbyte *buffer3;
+       unsigned char *buffer1;
+       unsigned char *buffer2;
+       unsigned char *buffer3;
        qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
 
        sprintf (base, "screenshots/%s", scr_screenshot_name.string);
@@ -802,9 +605,9 @@ void SCR_ScreenShot_f (void)
 
        sprintf(filename, "%s%06d.%s", base, shotnumber, jpeg ? "jpg" : "tga");
 
-       buffer1 = Mem_Alloc(tempmempool, vid.width * vid.height * 3);
-       buffer2 = Mem_Alloc(tempmempool, vid.width * vid.height * 3);
-       buffer3 = Mem_Alloc(tempmempool, vid.width * vid.height * 3 + 18);
+       buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3);
+       buffer2 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3);
+       buffer3 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3 + 18);
 
        if (SCR_ScreenShot (filename, buffer1, buffer2, buffer3, 0, 0, vid.width, vid.height, false, false, false, jpeg, true))
                Con_Printf("Wrote %s\n", filename);
@@ -818,51 +621,29 @@ void SCR_ScreenShot_f (void)
        shotnumber++;
 }
 
-typedef enum capturevideoformat_e
-{
-       CAPTUREVIDEOFORMAT_TARGA,
-       CAPTUREVIDEOFORMAT_JPEG,
-       CAPTUREVIDEOFORMAT_RAWRGB,
-       CAPTUREVIDEOFORMAT_RAWYV12
-}
-capturevideoformat_t;
-
-qboolean cl_capturevideo_active = false;
-capturevideoformat_t cl_capturevideo_format;
-static double cl_capturevideo_starttime = 0;
-double cl_capturevideo_framerate = 0;
-static int cl_capturevideo_soundrate = 0;
-static int cl_capturevideo_frame = 0;
-static qbyte *cl_capturevideo_buffer = NULL;
-static qfile_t *cl_capturevideo_videofile = NULL;
-qfile_t *cl_capturevideo_soundfile = NULL;
-static short cl_capturevideo_rgbtoyuvscaletable[3][3][256];
-static unsigned char cl_capturevideo_yuvnormalizetable[3][256];
-//static unsigned char cl_capturevideo_rgbgammatable[3][256];
-
 void SCR_CaptureVideo_BeginVideo(void)
 {
        double gamma, g;
        unsigned int i;
-       qbyte out[44];
-       if (cl_capturevideo_active)
+       unsigned char out[44];
+       if (cls.capturevideo_active)
                return;
        // soundrate is figured out on the first SoundFrame
-       cl_capturevideo_active = true;
-       cl_capturevideo_starttime = Sys_DoubleTime();
-       cl_capturevideo_framerate = bound(1, cl_capturevideo_fps.value, 1000);
-       cl_capturevideo_soundrate = 0;
-       cl_capturevideo_frame = 0;
-       cl_capturevideo_buffer = Mem_Alloc(tempmempool, vid.width * vid.height * (3+3+3) + 18);
+       cls.capturevideo_active = true;
+       cls.capturevideo_starttime = Sys_DoubleTime();
+       cls.capturevideo_framerate = bound(1, cl_capturevideo_fps.value, 1000);
+       cls.capturevideo_soundrate = 0;
+       cls.capturevideo_frame = 0;
+       cls.capturevideo_buffer = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * (3+3+3) + 18);
        gamma = 1.0/scr_screenshot_gamma.value;
 
        /*
        for (i = 0;i < 256;i++)
        {
                unsigned char j = (unsigned char)bound(0, 255*pow(i/255.0, gamma), 255);
-               cl_capturevideo_rgbgammatable[0][i] = j;
-               cl_capturevideo_rgbgammatable[1][i] = j;
-               cl_capturevideo_rgbgammatable[2][i] = j;
+               cls.capturevideo_rgbgammatable[0][i] = j;
+               cls.capturevideo_rgbgammatable[1][i] = j;
+               cls.capturevideo_rgbgammatable[2][i] = j;
        }
        */
 /*
@@ -877,73 +658,73 @@ Cr = R *  .500 + G * -.419 + B * -.0813 + 128.;
        {
                g = 255*pow(i/255.0, gamma);
                // Y weights from RGB
-               cl_capturevideo_rgbtoyuvscaletable[0][0][i] = (short)(g *  0.299);
-               cl_capturevideo_rgbtoyuvscaletable[0][1][i] = (short)(g *  0.587);
-               cl_capturevideo_rgbtoyuvscaletable[0][2][i] = (short)(g *  0.114);
+               cls.capturevideo_rgbtoyuvscaletable[0][0][i] = (short)(g *  0.299);
+               cls.capturevideo_rgbtoyuvscaletable[0][1][i] = (short)(g *  0.587);
+               cls.capturevideo_rgbtoyuvscaletable[0][2][i] = (short)(g *  0.114);
                // Cb weights from RGB
-               cl_capturevideo_rgbtoyuvscaletable[1][0][i] = (short)(g * -0.169);
-               cl_capturevideo_rgbtoyuvscaletable[1][1][i] = (short)(g * -0.332);
-               cl_capturevideo_rgbtoyuvscaletable[1][2][i] = (short)(g *  0.500);
+               cls.capturevideo_rgbtoyuvscaletable[1][0][i] = (short)(g * -0.169);
+               cls.capturevideo_rgbtoyuvscaletable[1][1][i] = (short)(g * -0.332);
+               cls.capturevideo_rgbtoyuvscaletable[1][2][i] = (short)(g *  0.500);
                // Cr weights from RGB
-               cl_capturevideo_rgbtoyuvscaletable[2][0][i] = (short)(g *  0.500);
-               cl_capturevideo_rgbtoyuvscaletable[2][1][i] = (short)(g * -0.419);
-               cl_capturevideo_rgbtoyuvscaletable[2][2][i] = (short)(g * -0.0813);
+               cls.capturevideo_rgbtoyuvscaletable[2][0][i] = (short)(g *  0.500);
+               cls.capturevideo_rgbtoyuvscaletable[2][1][i] = (short)(g * -0.419);
+               cls.capturevideo_rgbtoyuvscaletable[2][2][i] = (short)(g * -0.0813);
                // range reduction of YCbCr to valid signal range
-               cl_capturevideo_yuvnormalizetable[0][i] = 16 + i * (236-16) / 256;
-               cl_capturevideo_yuvnormalizetable[1][i] = 16 + i * (240-16) / 256;
-               cl_capturevideo_yuvnormalizetable[2][i] = 16 + i * (240-16) / 256;
+               cls.capturevideo_yuvnormalizetable[0][i] = 16 + i * (236-16) / 256;
+               cls.capturevideo_yuvnormalizetable[1][i] = 16 + i * (240-16) / 256;
+               cls.capturevideo_yuvnormalizetable[2][i] = 16 + i * (240-16) / 256;
        }
 
        if (cl_capturevideo_rawrgb.integer)
        {
-               cl_capturevideo_format = CAPTUREVIDEOFORMAT_RAWRGB;
-               cl_capturevideo_videofile = FS_Open ("video/dpvideo.rgb", "wb", false, true);
+               cls.capturevideo_format = CAPTUREVIDEOFORMAT_RAWRGB;
+               cls.capturevideo_videofile = FS_Open ("video/dpvideo.rgb", "wb", false, true);
        }
        else if (cl_capturevideo_rawyv12.integer)
        {
-               cl_capturevideo_format = CAPTUREVIDEOFORMAT_RAWYV12;
-               cl_capturevideo_videofile = FS_Open ("video/dpvideo.yv12", "wb", false, true);
+               cls.capturevideo_format = CAPTUREVIDEOFORMAT_RAWYV12;
+               cls.capturevideo_videofile = FS_Open ("video/dpvideo.yv12", "wb", false, true);
        }
        else if (scr_screenshot_jpeg.integer)
        {
-               cl_capturevideo_format = CAPTUREVIDEOFORMAT_JPEG;
-               cl_capturevideo_videofile = NULL;
+               cls.capturevideo_format = CAPTUREVIDEOFORMAT_JPEG;
+               cls.capturevideo_videofile = NULL;
        }
        else
        {
-               cl_capturevideo_format = CAPTUREVIDEOFORMAT_TARGA;
-               cl_capturevideo_videofile = NULL;
+               cls.capturevideo_format = CAPTUREVIDEOFORMAT_TARGA;
+               cls.capturevideo_videofile = NULL;
        }
 
        if (cl_capturevideo_sound.integer)
        {
-               cl_capturevideo_soundfile = FS_Open ("video/dpvideo.wav", "wb", false, true);
+               cls.capturevideo_soundfile = FS_Open ("video/dpvideo.wav", "wb", false, true);
                // wave header will be filled out when video ends
                memset(out, 0, 44);
-               FS_Write (cl_capturevideo_soundfile, out, 44);
+               FS_Write (cls.capturevideo_soundfile, out, 44);
        }
        else
-               cl_capturevideo_soundfile = NULL;
+               cls.capturevideo_soundfile = NULL;
 }
 
 void SCR_CaptureVideo_EndVideo(void)
 {
        int i, n;
-       qbyte out[44];
-       if (!cl_capturevideo_active)
+       unsigned char out[44];
+       if (!cls.capturevideo_active)
                return;
-       cl_capturevideo_active = false;
+       cls.capturevideo_active = false;
 
-       if (cl_capturevideo_videofile)
+       if (cls.capturevideo_videofile)
        {
-               FS_Close(cl_capturevideo_videofile);
-               cl_capturevideo_videofile = NULL;
+               FS_Close(cls.capturevideo_videofile);
+               cls.capturevideo_videofile = NULL;
        }
 
        // finish the wave file
-       if (cl_capturevideo_soundfile)
+       if (cls.capturevideo_soundfile)
        {
-               i = (int)FS_Tell (cl_capturevideo_soundfile);
+               i = (int)FS_Tell (cls.capturevideo_soundfile);
                //"RIFF", (int) unknown (chunk size), "WAVE",
                //"fmt ", (int) 16 (chunk size), (short) format 1 (uncompressed PCM), (short) 2 channels, (int) unknown rate, (int) unknown bytes per second, (short) 4 bytes per sample (channels * bytes per channel), (short) 16 bits per channel
                //"data", (int) unknown (chunk size)
@@ -955,13 +736,13 @@ void SCR_CaptureVideo_EndVideo(void)
                out[6] = (n >> 16) & 0xFF;
                out[7] = (n >> 24) & 0xFF;
                // rate
-               n = cl_capturevideo_soundrate;
+               n = cls.capturevideo_soundrate;
                out[24] = (n) & 0xFF;
                out[25] = (n >> 8) & 0xFF;
                out[26] = (n >> 16) & 0xFF;
                out[27] = (n >> 24) & 0xFF;
                // bytes per second (rate * channels * bytes per channel)
-               n = cl_capturevideo_soundrate * 2 * 2;
+               n = cls.capturevideo_soundrate * 2 * 2;
                out[28] = (n) & 0xFF;
                out[29] = (n >> 8) & 0xFF;
                out[30] = (n >> 16) & 0xFF;
@@ -972,21 +753,21 @@ void SCR_CaptureVideo_EndVideo(void)
                out[41] = (n >> 8) & 0xFF;
                out[42] = (n >> 16) & 0xFF;
                out[43] = (n >> 24) & 0xFF;
-               FS_Seek (cl_capturevideo_soundfile, 0, SEEK_SET);
-               FS_Write (cl_capturevideo_soundfile, out, 44);
-               FS_Close (cl_capturevideo_soundfile);
-               cl_capturevideo_soundfile = NULL;
+               FS_Seek (cls.capturevideo_soundfile, 0, SEEK_SET);
+               FS_Write (cls.capturevideo_soundfile, out, 44);
+               FS_Close (cls.capturevideo_soundfile);
+               cls.capturevideo_soundfile = NULL;
        }
 
-       if (cl_capturevideo_buffer)
+       if (cls.capturevideo_buffer)
        {
-               Mem_Free (cl_capturevideo_buffer);
-               cl_capturevideo_buffer = NULL;
+               Mem_Free (cls.capturevideo_buffer);
+               cls.capturevideo_buffer = NULL;
        }
 
-       cl_capturevideo_starttime = 0;
-       cl_capturevideo_framerate = 0;
-       cl_capturevideo_frame = 0;
+       cls.capturevideo_starttime = 0;
+       cls.capturevideo_framerate = 0;
+       cls.capturevideo_frame = 0;
 }
 
 qboolean SCR_CaptureVideo_VideoFrame(int newframenum)
@@ -995,85 +776,85 @@ qboolean SCR_CaptureVideo_VideoFrame(int newframenum)
        unsigned char *b, *out;
        char filename[32];
        int outoffset = (width/2)*(height/2);
-       //return SCR_ScreenShot(filename, cl_capturevideo_buffer, cl_capturevideo_buffer + vid.width * vid.height * 3, cl_capturevideo_buffer + vid.width * vid.height * 6, 0, 0, vid.width, vid.height, false, false, false, jpeg, true);
+       //return SCR_ScreenShot(filename, cls.capturevideo_buffer, cls.capturevideo_buffer + vid.width * vid.height * 3, cls.capturevideo_buffer + vid.width * vid.height * 6, 0, 0, vid.width, vid.height, false, false, false, jpeg, true);
        // speed is critical here, so do saving as directly as possible
-       switch (cl_capturevideo_format)
+       switch (cls.capturevideo_format)
        {
        case CAPTUREVIDEOFORMAT_RAWYV12:
                // FIXME: width/height must be multiple of 2, enforce this?
-               qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cl_capturevideo_buffer);
+               qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cls.capturevideo_buffer);
                CHECKGLERROR
                // process one line at a time, and CbCr every other line at 2 pixel intervals
                for (y = 0;y < height;y++)
                {
                        // 1x1 Y
-                       for (b = cl_capturevideo_buffer + (height-1-y)*width*3, out = cl_capturevideo_buffer + width*height*3 + y*width, x = 0;x < width;x++, b += 3, out++)
-                               *out = cl_capturevideo_yuvnormalizetable[0][cl_capturevideo_rgbtoyuvscaletable[0][0][b[0]] + cl_capturevideo_rgbtoyuvscaletable[0][1][b[1]] + cl_capturevideo_rgbtoyuvscaletable[0][2][b[2]]];
+                       for (b = cls.capturevideo_buffer + (height-1-y)*width*3, out = cls.capturevideo_buffer + width*height*3 + y*width, x = 0;x < width;x++, b += 3, out++)
+                               *out = cls.capturevideo_yuvnormalizetable[0][cls.capturevideo_rgbtoyuvscaletable[0][0][b[0]] + cls.capturevideo_rgbtoyuvscaletable[0][1][b[1]] + cls.capturevideo_rgbtoyuvscaletable[0][2][b[2]]];
                        if ((y & 1) == 0)
                        {
                                // 2x2 Cb and Cr planes
 #if 1
                                // low quality, no averaging
-                               for (b = cl_capturevideo_buffer + (height-2-y)*width*3, out = cl_capturevideo_buffer + width*height*3 + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++)
+                               for (b = cls.capturevideo_buffer + (height-2-y)*width*3, out = cls.capturevideo_buffer + width*height*3 + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++)
                                {
                                        // Cr
-                                       out[0        ] = cl_capturevideo_yuvnormalizetable[2][cl_capturevideo_rgbtoyuvscaletable[2][0][b[0]] + cl_capturevideo_rgbtoyuvscaletable[2][1][b[1]] + cl_capturevideo_rgbtoyuvscaletable[2][2][b[2]] + 128];
+                                       out[0        ] = cls.capturevideo_yuvnormalizetable[2][cls.capturevideo_rgbtoyuvscaletable[2][0][b[0]] + cls.capturevideo_rgbtoyuvscaletable[2][1][b[1]] + cls.capturevideo_rgbtoyuvscaletable[2][2][b[2]] + 128];
                                        // Cb
-                                       out[outoffset] = cl_capturevideo_yuvnormalizetable[1][cl_capturevideo_rgbtoyuvscaletable[1][0][b[0]] + cl_capturevideo_rgbtoyuvscaletable[1][1][b[1]] + cl_capturevideo_rgbtoyuvscaletable[1][2][b[2]] + 128];
+                                       out[outoffset] = cls.capturevideo_yuvnormalizetable[1][cls.capturevideo_rgbtoyuvscaletable[1][0][b[0]] + cls.capturevideo_rgbtoyuvscaletable[1][1][b[1]] + cls.capturevideo_rgbtoyuvscaletable[1][2][b[2]] + 128];
                                }
 #else
                                // high quality, averaging
                                int inpitch = width*3;
-                               for (b = cl_capturevideo_buffer + (height-2-y)*width*3, out = cl_capturevideo_buffer + width*height*3 + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++)
+                               for (b = cls.capturevideo_buffer + (height-2-y)*width*3, out = cls.capturevideo_buffer + width*height*3 + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++)
                                {
                                        int blockr, blockg, blockb;
                                        blockr = (b[0] + b[3] + b[inpitch+0] + b[inpitch+3]) >> 2;
                                        blockg = (b[1] + b[4] + b[inpitch+1] + b[inpitch+4]) >> 2;
                                        blockb = (b[2] + b[5] + b[inpitch+2] + b[inpitch+5]) >> 2;
                                        // Cr
-                                       out[0        ] = cl_capturevideo_yuvnormalizetable[2][cl_capturevideo_rgbtoyuvscaletable[2][0][blockr] + cl_capturevideo_rgbtoyuvscaletable[2][1][blockg] + cl_capturevideo_rgbtoyuvscaletable[2][2][blockb] + 128];
+                                       out[0        ] = cls.capturevideo_yuvnormalizetable[2][cls.capturevideo_rgbtoyuvscaletable[2][0][blockr] + cls.capturevideo_rgbtoyuvscaletable[2][1][blockg] + cls.capturevideo_rgbtoyuvscaletable[2][2][blockb] + 128];
                                        // Cb
-                                       out[outoffset] = cl_capturevideo_yuvnormalizetable[1][cl_capturevideo_rgbtoyuvscaletable[1][0][blockr] + cl_capturevideo_rgbtoyuvscaletable[1][1][blockg] + cl_capturevideo_rgbtoyuvscaletable[1][2][blockb] + 128];
+                                       out[outoffset] = cls.capturevideo_yuvnormalizetable[1][cls.capturevideo_rgbtoyuvscaletable[1][0][blockr] + cls.capturevideo_rgbtoyuvscaletable[1][1][blockg] + cls.capturevideo_rgbtoyuvscaletable[1][2][blockb] + 128];
                                }
 #endif
                        }
                }
-               for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++)
-                       if (!FS_Write (cl_capturevideo_videofile, cl_capturevideo_buffer + width*height*3, width*height+(width/2)*(height/2)*2))
+               for (;cls.capturevideo_frame < newframenum;cls.capturevideo_frame++)
+                       if (!FS_Write (cls.capturevideo_videofile, cls.capturevideo_buffer + width*height*3, width*height+(width/2)*(height/2)*2))
                                return false;
                return true;
        case CAPTUREVIDEOFORMAT_RAWRGB:
-               qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cl_capturevideo_buffer);
+               qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cls.capturevideo_buffer);
                CHECKGLERROR
-               for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++)
-                       if (!FS_Write (cl_capturevideo_videofile, cl_capturevideo_buffer, width*height*3))
+               for (;cls.capturevideo_frame < newframenum;cls.capturevideo_frame++)
+                       if (!FS_Write (cls.capturevideo_videofile, cls.capturevideo_buffer, width*height*3))
                                return false;
                return true;
        case CAPTUREVIDEOFORMAT_JPEG:
-               qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cl_capturevideo_buffer);
+               qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cls.capturevideo_buffer);
                CHECKGLERROR
-               for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++)
+               for (;cls.capturevideo_frame < newframenum;cls.capturevideo_frame++)
                {
-                       sprintf(filename, "video/dp%06d.jpg", cl_capturevideo_frame);
-                       if (!JPEG_SaveImage_preflipped (filename, width, height, cl_capturevideo_buffer))
+                       sprintf(filename, "video/dp%06d.jpg", cls.capturevideo_frame);
+                       if (!JPEG_SaveImage_preflipped (filename, width, height, cls.capturevideo_buffer))
                                return false;
                }
                return true;
        case CAPTUREVIDEOFORMAT_TARGA:
-               //return Image_WriteTGARGB_preflipped (filename, width, height, cl_capturevideo_buffer, cl_capturevideo_buffer + vid.width * vid.height * 3, );
-               memset (cl_capturevideo_buffer, 0, 18);
-               cl_capturevideo_buffer[2] = 2;          // uncompressed type
-               cl_capturevideo_buffer[12] = (width >> 0) & 0xFF;
-               cl_capturevideo_buffer[13] = (width >> 8) & 0xFF;
-               cl_capturevideo_buffer[14] = (height >> 0) & 0xFF;
-               cl_capturevideo_buffer[15] = (height >> 8) & 0xFF;
-               cl_capturevideo_buffer[16] = 24;        // pixel size
-               qglReadPixels (x, y, width, height, GL_BGR, GL_UNSIGNED_BYTE, cl_capturevideo_buffer + 18);
+               //return Image_WriteTGARGB_preflipped (filename, width, height, cls.capturevideo_buffer, cls.capturevideo_buffer + vid.width * vid.height * 3, );
+               memset (cls.capturevideo_buffer, 0, 18);
+               cls.capturevideo_buffer[2] = 2;         // uncompressed type
+               cls.capturevideo_buffer[12] = (width >> 0) & 0xFF;
+               cls.capturevideo_buffer[13] = (width >> 8) & 0xFF;
+               cls.capturevideo_buffer[14] = (height >> 0) & 0xFF;
+               cls.capturevideo_buffer[15] = (height >> 8) & 0xFF;
+               cls.capturevideo_buffer[16] = 24;       // pixel size
+               qglReadPixels (x, y, width, height, GL_BGR, GL_UNSIGNED_BYTE, cls.capturevideo_buffer + 18);
                CHECKGLERROR
-               for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++)
+               for (;cls.capturevideo_frame < newframenum;cls.capturevideo_frame++)
                {
-                       sprintf(filename, "video/dp%06d.tga", cl_capturevideo_frame);
-                       if (!FS_WriteFile (filename, cl_capturevideo_buffer, width*height*3 + 18))
+                       sprintf(filename, "video/dp%06d.tga", cls.capturevideo_frame);
+                       if (!FS_WriteFile (filename, cls.capturevideo_buffer, width*height*3 + 18))
                                return false;
                }
                return true;
@@ -1082,15 +863,15 @@ qboolean SCR_CaptureVideo_VideoFrame(int newframenum)
        }
 }
 
-void SCR_CaptureVideo_SoundFrame(qbyte *bufstereo16le, size_t length, int rate)
+void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate)
 {
-       if (!cl_capturevideo_soundfile)
+       if (!cls.capturevideo_soundfile)
                return;
-       cl_capturevideo_soundrate = rate;
-       if (FS_Write (cl_capturevideo_soundfile, bufstereo16le, 4 * length) < (fs_offset_t)(4 * length))
+       cls.capturevideo_soundrate = rate;
+       if (FS_Write (cls.capturevideo_soundfile, bufstereo16le, 4 * length) < (fs_offset_t)(4 * length))
        {
                Cvar_SetValueQuick(&cl_capturevideo, 0);
-               Con_Printf("video sound saving failed on frame %i, out of disk space? stopping video capture.\n", cl_capturevideo_frame);
+               Con_Printf("video sound saving failed on frame %i, out of disk space? stopping video capture.\n", cls.capturevideo_frame);
                SCR_CaptureVideo_EndVideo();
        }
 }
@@ -1100,25 +881,25 @@ void SCR_CaptureVideo(void)
        int newframenum;
        if (cl_capturevideo.integer && r_render.integer)
        {
-               if (!cl_capturevideo_active)
+               if (!cls.capturevideo_active)
                        SCR_CaptureVideo_BeginVideo();
-               if (cl_capturevideo_framerate != cl_capturevideo_fps.value)
+               if (cls.capturevideo_framerate != cl_capturevideo_fps.value)
                {
                        Con_Printf("You can not change the video framerate while recording a video.\n");
-                       Cvar_SetValueQuick(&cl_capturevideo_fps, cl_capturevideo_framerate);
+                       Cvar_SetValueQuick(&cl_capturevideo_fps, cls.capturevideo_framerate);
                }
-               if (cl_capturevideo_soundfile)
+               if (cls.capturevideo_soundfile)
                {
                        // preserve sound sync by duplicating frames when running slow
-                       newframenum = (Sys_DoubleTime() - cl_capturevideo_starttime) * cl_capturevideo_framerate;
+                       newframenum = (Sys_DoubleTime() - cls.capturevideo_starttime) * cls.capturevideo_framerate;
                }
                else
-                       newframenum = cl_capturevideo_frame + 1;
+                       newframenum = cls.capturevideo_frame + 1;
                // if falling behind more than one second, stop
-               if (newframenum - cl_capturevideo_frame > (int)ceil(cl_capturevideo_framerate))
+               if (newframenum - cls.capturevideo_frame > (int)ceil(cls.capturevideo_framerate))
                {
                        Cvar_SetValueQuick(&cl_capturevideo, 0);
-                       Con_Printf("video saving failed on frame %i, your machine is too slow for this capture speed.\n", cl_capturevideo_frame);
+                       Con_Printf("video saving failed on frame %i, your machine is too slow for this capture speed.\n", cls.capturevideo_frame);
                        SCR_CaptureVideo_EndVideo();
                        return;
                }
@@ -1126,11 +907,11 @@ void SCR_CaptureVideo(void)
                if (!SCR_CaptureVideo_VideoFrame(newframenum))
                {
                        Cvar_SetValueQuick(&cl_capturevideo, 0);
-                       Con_Printf("video saving failed on frame %i, out of disk space? stopping video capture.\n", cl_capturevideo_frame);
+                       Con_Printf("video saving failed on frame %i, out of disk space? stopping video capture.\n", cls.capturevideo_frame);
                        SCR_CaptureVideo_EndVideo();
                }
        }
-       else if (cl_capturevideo_active)
+       else if (cls.capturevideo_active)
                SCR_CaptureVideo_EndVideo();
 }
 
@@ -1141,7 +922,7 @@ R_Envmap_f
 Grab six views for environment mapping tests
 ===============
 */
-struct
+struct envmapinfo_s
 {
        float angles[3];
        char *name;
@@ -1167,10 +948,10 @@ envmapinfo[12] =
 static void R_Envmap_f (void)
 {
        int j, size;
-       char filename[256], basename[256];
-       qbyte *buffer1;
-       qbyte *buffer2;
-       qbyte *buffer3;
+       char filename[MAX_QPATH], basename[MAX_QPATH];
+       unsigned char *buffer1;
+       unsigned char *buffer2;
+       unsigned char *buffer3;
 
        if (Cmd_Argc() != 3)
        {
@@ -1198,12 +979,12 @@ static void R_Envmap_f (void)
        r_refdef.width = size;
        r_refdef.height = size;
 
-       r_refdef.fov_x = 90;
-       r_refdef.fov_y = 90;
+       r_refdef.frustum_x = tan(90 * M_PI / 360.0);
+       r_refdef.frustum_y = tan(90 * M_PI / 360.0);
 
-       buffer1 = Mem_Alloc(tempmempool, size * size * 3);
-       buffer2 = Mem_Alloc(tempmempool, size * size * 3);
-       buffer3 = Mem_Alloc(tempmempool, size * size * 3 + 18);
+       buffer1 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3);
+       buffer2 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3);
+       buffer3 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3 + 18);
 
        for (j = 0;j < 12;j++)
        {
@@ -1242,7 +1023,7 @@ showlmp_t showlmp[SHOWLMP_MAXLABELS];
 void SHOWLMP_decodehide(void)
 {
        int i;
-       qbyte *lmplabel;
+       char *lmplabel;
        lmplabel = MSG_ReadString();
        for (i = 0;i < SHOWLMP_MAXLABELS;i++)
                if (showlmp[i].isactive && strcmp(showlmp[i].label, lmplabel) == 0)
@@ -1255,7 +1036,7 @@ void SHOWLMP_decodehide(void)
 void SHOWLMP_decodeshow(void)
 {
        int i, k;
-       qbyte lmplabel[256], picname[256];
+       char lmplabel[256], picname[256];
        float x, y;
        strlcpy (lmplabel,MSG_ReadString(), sizeof (lmplabel));
        strlcpy (picname, MSG_ReadString(), sizeof (picname));
@@ -1296,7 +1077,7 @@ void SHOWLMP_drawall(void)
        int i;
        for (i = 0;i < SHOWLMP_MAXLABELS;i++)
                if (showlmp[i].isactive)
-                       DrawQ_Pic(showlmp[i].x, showlmp[i].y, showlmp[i].pic, 0, 0, 1, 1, 1, 1, 0);
+                       DrawQ_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic, true), 0, 0, 1, 1, 1, 1, 0);
 }
 
 void SHOWLMP_clear(void)
@@ -1306,28 +1087,262 @@ void SHOWLMP_clear(void)
                showlmp[i].isactive = false;
 }
 
-void CL_SetupScreenSize(void)
+/*
+==============================================================================
+
+                                               SCREEN SHOTS
+
+==============================================================================
+*/
+
+qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect)
 {
-       float conwidth, conheight;
+       int     indices[3] = {0,1,2};
+       qboolean ret;
 
-       VID_UpdateGamma(false);
+       if (!r_render.integer)
+               return false;
 
-       conwidth = bound(320, vid_conwidth.value, 2048);
-       conheight = bound(200, vid_conheight.value, 1536);
-       if (vid_conwidth.value != conwidth)
-               Cvar_SetValue("vid_conwidth", conwidth);
-       if (vid_conheight.value != conheight)
-               Cvar_SetValue("vid_conheight", conheight);
+       qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);
+       CHECKGLERROR
 
-       vid_conwidth.integer = vid_conwidth.integer;
-       vid_conheight.integer = vid_conheight.integer;
+       if (scr_screenshot_gamma.value != 1 && gammacorrect)
+       {
+               int i;
+               double igamma = 1.0 / scr_screenshot_gamma.value;
+               unsigned char ramp[256];
+               for (i = 0;i < 256;i++)
+                       ramp[i] = (unsigned char) (pow(i * (1.0 / 255.0), igamma) * 255.0);
+               for (i = 0;i < width*height*3;i++)
+                       buffer1[i] = ramp[buffer1[i]];
+       }
 
-       SCR_SetUpToDrawConsole();
+       Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices);
+
+       if (jpeg)
+               ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2);
+       else
+               ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer2, buffer3);
+
+       return ret;
+}
+
+//=============================================================================
+
+void R_ClearScreen(void)
+{
+       if (r_render.integer)
+       {
+               // clear to black
+               if (fogenabled)
+                       qglClearColor(fogcolor[0],fogcolor[1],fogcolor[2],0);
+               else
+                       qglClearColor(0,0,0,0);
+               CHECKGLERROR
+               qglClearDepth(1);CHECKGLERROR
+               if (gl_stencil)
+               {
+                       // LordHavoc: we use a stencil centered around 128 instead of 0,
+                       // to avoid clamping interfering with strange shadow volume
+                       // drawing orders
+                       qglClearStencil(128);CHECKGLERROR
+               }
+               // clear the screen
+               GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0));
+               // set dithering mode
+               if (gl_dither.integer)
+               {
+                       qglEnable(GL_DITHER);CHECKGLERROR
+               }
+               else
+               {
+                       qglDisable(GL_DITHER);CHECKGLERROR
+               }
+       }
+}
+
+qboolean CL_VM_UpdateView (void);
+void SCR_DrawConsole (void);
+void R_Shadow_EditLights_DrawSelectedLightProperties(void);
+
+int r_stereo_side;
+
+void SCR_DrawScreen (void)
+{
+       R_Mesh_Start();
+
+       if (r_timereport_active)
+               R_TimeReport("setup");
+
+       if (cls.signon == SIGNONS)
+       {
+               float size;
+
+               size = scr_viewsize.value * (1.0 / 100.0);
+               size = min(size, 1);
+
+               if (r_stereo_sidebyside.integer)
+               {
+                       r_refdef.width = vid.width * size / 2.5;
+                       r_refdef.height = vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
+                       r_refdef.x = (vid.width - r_refdef.width * 2.5) * 0.5;
+                       r_refdef.y = (vid.height - r_refdef.height)/2;
+                       if (r_stereo_side)
+                               r_refdef.x += r_refdef.width * 1.5;
+               }
+               else
+               {
+                       r_refdef.width = vid.width * size;
+                       r_refdef.height = vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100);
+                       r_refdef.x = (vid.width - r_refdef.width)/2;
+                       r_refdef.y = (vid.height - r_refdef.height)/2;
+               }
+
+               // LordHavoc: viewzoom (zoom in for sniper rifles, etc)
+               // LordHavoc: this is designed to produce widescreen fov values
+               // when the screen is wider than 4/3 width/height aspect, to do
+               // this it simply assumes the requested fov is the vertical fov
+               // for a 4x3 display, if the ratio is not 4x3 this makes the fov
+               // higher/lower according to the ratio
+               r_refdef.frustum_y = tan(scr_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
+               r_refdef.frustum_x = r_refdef.frustum_y * (float)r_refdef.width / (float)r_refdef.height / vid_pixelheight.value;
+
+               r_refdef.frustum_x *= r_refdef.frustumscale_x;
+               r_refdef.frustum_y *= r_refdef.frustumscale_y;
+
+               if(!CL_VM_UpdateView())
+                       R_RenderView();
+               else
+                       SCR_DrawConsole();
+
+               if (scr_zoomwindow.integer)
+               {
+                       float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0;
+                       float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0;
+                       r_refdef.width = vid.width * sizex;
+                       r_refdef.height = vid.height * sizey;
+                       r_refdef.x = (vid.width - r_refdef.width)/2;
+                       r_refdef.y = 0;
+
+                       r_refdef.frustum_y = tan(scr_zoomwindow_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
+                       r_refdef.frustum_x = r_refdef.frustum_y * vid_pixelheight.value * (float)r_refdef.width / (float)r_refdef.height;
+
+                       r_refdef.frustum_x *= r_refdef.frustumscale_x;
+                       r_refdef.frustum_y *= r_refdef.frustumscale_y;
+
+                       if(!CL_VM_UpdateView())
+                               R_RenderView();
+               }
+       }
+
+       if (!r_stereo_sidebyside.integer)
+       {
+               r_refdef.width = vid.width;
+               r_refdef.height = vid.height;
+               r_refdef.x = 0;
+               r_refdef.y = 0;
+       }
+
+       // draw 2D stuff
+       DrawQ_Begin();
+
+       //FIXME: force menu if nothing else to look at?
+       //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected)
+
+       if (cls.signon == SIGNONS)
+       {
+               SCR_DrawNet ();
+               SCR_DrawTurtle ();
+               SCR_DrawPause ();
+               if (!r_letterbox.value)
+                       Sbar_Draw();
+               SHOWLMP_drawall();
+               SCR_CheckDrawCenterString();
+       }
+       MR_Draw();
+       CL_DrawVideo();
+       R_Shadow_EditLights_DrawSelectedLightProperties();
+
+       if(!csqc_loaded)
+               SCR_DrawConsole();
+
+       SCR_DrawBrand();
+
+       SCR_DrawDownload();
+
+       if (r_timereport_active)
+               R_TimeReport("2d");
+
+       if (cls.signon == SIGNONS)
+               R_TimeReport_Frame();
+
+       DrawQ_Finish();
+
+       R_DrawGamma();
+
+       R_Mesh_Finish();
+
+       if (r_timereport_active)
+               R_TimeReport("meshfinish");
+}
+
+void SCR_UpdateLoadingScreen (void)
+{
+       float x, y;
+       cachepic_t *pic;
+       rmeshstate_t m;
+       float vertex3f[12];
+       float texcoord2f[8];
+       // don't do anything if not initialized yet
+       if (vid_hidden)
+               return;
+       qglViewport(0, 0, vid.width, vid.height);
+       //qglDisable(GL_SCISSOR_TEST);
+       //qglDepthMask(1);
+       qglColorMask(1,1,1,1);
+       //qglClearColor(0,0,0,0);
+       //qglClear(GL_COLOR_BUFFER_BIT);
+       //qglCullFace(GL_FRONT);
+       //qglDisable(GL_CULL_FACE);
+       //R_ClearScreen();
+       R_Textures_Frame();
+       GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+       R_Mesh_Start();
+       R_Mesh_Matrix(&identitymatrix);
+       // draw the loading plaque
+       pic = Draw_CachePic("gfx/loading", true);
+       x = (vid_conwidth.integer - pic->width)/2;
+       y = (vid_conheight.integer - pic->height)/2;
+       GL_Color(1,1,1,1);
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthTest(false);
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = vertex3f;
+       m.pointer_texcoord[0] = texcoord2f;
+       m.tex[0] = R_GetTexture(pic->tex);
+       R_Mesh_State(&m);
+       vertex3f[2] = vertex3f[5] = vertex3f[8] = vertex3f[11] = 0;
+       vertex3f[0] = vertex3f[9] = x;
+       vertex3f[1] = vertex3f[4] = y;
+       vertex3f[3] = vertex3f[6] = x + pic->width;
+       vertex3f[7] = vertex3f[10] = y + pic->height;
+       texcoord2f[0] = 0;texcoord2f[1] = 0;
+       texcoord2f[2] = 1;texcoord2f[3] = 0;
+       texcoord2f[4] = 1;texcoord2f[5] = 1;
+       texcoord2f[6] = 0;texcoord2f[7] = 1;
+       R_Mesh_Draw(0, 4, 2, polygonelements);
+       R_Mesh_Finish();
+       // refresh
+       VID_Finish(false);
 }
 
-extern void R_Shadow_EditLights_DrawSelectedLightProperties(void);
 void CL_UpdateScreen(void)
 {
+       float conwidth, conheight;
+
+       if (vid_hidden)
+               return;
+
        if (!scr_initialized || !con_initialized || vid_hidden)
                return;                         // not initialized yet
 
@@ -1340,6 +1355,13 @@ void CL_UpdateScreen(void)
                        Cvar_Set ("r_ambient", "0");
        }
 
+       conwidth = bound(320, vid_conwidth.value, 2048);
+       conheight = bound(200, vid_conheight.value, 1536);
+       if (vid_conwidth.value != conwidth)
+               Cvar_SetValue("vid_conwidth", conwidth);
+       if (vid_conheight.value != conheight)
+               Cvar_SetValue("vid_conheight", conheight);
+
        // bound viewsize
        if (scr_viewsize.value < 30)
                Cvar_Set ("viewsize","30");
@@ -1352,6 +1374,16 @@ void CL_UpdateScreen(void)
        if (scr_fov.value > 170)
                Cvar_Set ("fov","170");
 
+       // validate r_textureunits cvar
+       if (r_textureunits.integer > gl_textureunits)
+               Cvar_SetValueQuick(&r_textureunits, gl_textureunits);
+       if (r_textureunits.integer < 1)
+               Cvar_SetValueQuick(&r_textureunits, 1);
+
+       // validate gl_combine cvar
+       if (gl_combine.integer && !gl_combine_extension)
+               Cvar_SetValueQuick(&gl_combine, 0);
+
        // intermission is always full screen
        if (cl.intermission)
                sb_lines = 0;
@@ -1369,46 +1401,71 @@ void CL_UpdateScreen(void)
        r_refdef.colormask[1] = 1;
        r_refdef.colormask[2] = 1;
 
-       SCR_CaptureVideo();
-
-       if (cls.signon == SIGNONS)
+       if (r_timereport_active)
                R_TimeReport("other");
 
-       CL_SetupScreenSize();
+       SCR_SetUpToDrawConsole();
 
-       DrawQ_Clear();
+       if (r_timereport_active)
+               R_TimeReport("start");
 
-       if (cls.signon == SIGNONS)
-               R_TimeReport("setup");
+       CHECKGLERROR
+       qglViewport(0, 0, vid.width, vid.height);
+       qglDisable(GL_SCISSOR_TEST);
+       qglDepthMask(1);
+       qglColorMask(1,1,1,1);
+       qglClearColor(0,0,0,0);
+       qglClear(GL_COLOR_BUFFER_BIT);
+       CHECKGLERROR
 
-       //FIXME: force menu if nothing else to look at?
-       //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected)
+       if (r_timereport_active)
+               R_TimeReport("clear");
 
-       if (cls.signon == SIGNONS)
-       {
-               SCR_DrawNet ();
-               SCR_DrawTurtle ();
-               SCR_DrawPause ();
-               if (!r_letterbox.value)
-                       Sbar_Draw();
-               SHOWLMP_drawall();
-               SCR_CheckDrawCenterString();
-       }
-       MR_Draw();
-       UI_Callback_Draw();
-       CL_DrawVideo();
-       //ui_draw();
-       if (cls.signon == SIGNONS)
+       if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer)
        {
-               R_TimeReport("2d");
-               R_TimeReport_End();
-               R_TimeReport_Start();
+               matrix4x4_t originalmatrix = r_refdef.viewentitymatrix;
+               r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1];
+               r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[1][1];
+               r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[2][1];
+
+               if (r_stereo_sidebyside.integer)
+                       r_stereo_side = 0;
+
+               if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer)
+               {
+                       r_refdef.colormask[0] = 1;
+                       r_refdef.colormask[1] = 0;
+                       r_refdef.colormask[2] = 0;
+               }
+
+               SCR_DrawScreen();
+
+               r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1];
+               r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[1][1];
+               r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[2][1];
+
+               if (r_stereo_sidebyside.integer)
+                       r_stereo_side = 1;
+
+               if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer)
+               {
+                       r_refdef.colormask[0] = 0;
+                       r_refdef.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer;
+                       r_refdef.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer;
+               }
+
+               SCR_DrawScreen();
+
+               r_refdef.viewentitymatrix = originalmatrix;
        }
-       R_Shadow_EditLights_DrawSelectedLightProperties();
+       else
+               SCR_DrawScreen();
 
-       SCR_DrawConsole();
+       SCR_CaptureVideo();
 
-       SCR_UpdateScreen();
+       VID_Finish(true);
+       if (r_timereport_active)
+               R_TimeReport("finish");
 }
 
 void CL_Screen_NewMap(void)