Moved an extern to the proper header.

[xonotic/darkplaces.git] / vid_shared.c

diff --git a/vid_shared.c b/vid_shared.c
index 7589a181153efabea9eea452d302d7070d716459..a6bc8a9f6c8e4ee6a1e538d74de42bb6a209903b 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -1,6 +1,9 @@
 
 #include "quakedef.h"
 
+// Tell startup code that we have a client
+int cl_available = true;
+
 // global video state
 viddef_t vid;
 
@@ -46,8 +49,6 @@ int vid_hidden = true;
 // LordHavoc: if window is not the active window, don't hog as much CPU time,
 // let go of the mouse, turn off sound, and restore system gamma ramps...
 int vid_activewindow = true;
-// LordHavoc: whether to allow use of hwgamma (disabled when window is inactive)
-int vid_allowhwgamma = false;
 
 // we don't know until we try it!
 cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1"};
@@ -84,6 +85,7 @@ cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1"};
 cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1"};
 cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1"};
 cvar_t v_hwgamma = {CVAR_SAVE, "v_hwgamma", "1"};
+cvar_t v_psycho = {0, "v_psycho", "0"};
 
 // brand of graphics chip
 const char *gl_vendor;
@@ -599,13 +601,16 @@ void VID_UpdateGamma(qboolean force)
 {
        cvar_t *c;
        float f;
+       static int forcenextframe = false;
 
        // LordHavoc: don't mess with gamma tables if running dedicated
        if (cls.state == ca_dedicated)
                return;
 
        if (!force
-        && vid_usinghwgamma == (vid_allowhwgamma && v_hwgamma.integer)
+        && !forcenextframe
+        && !v_psycho.integer
+        && vid_usinghwgamma == (vid_activewindow && v_hwgamma.integer)
         && v_gamma.value == cachegamma
         && v_contrast.value == cachecontrast
         && v_brightness.value == cachebrightness
@@ -620,8 +625,10 @@ void VID_UpdateGamma(qboolean force)
         && cachewhite[1] == v_color_white_g.value
         && cachewhite[2] == v_color_white_b.value)
                return;
+               
+       forcenextframe = false;
 
-       if (vid_allowhwgamma && v_hwgamma.integer)
+       if (vid_activewindow && v_hwgamma.integer)
        {
                if (!vid_usinghwgamma)
                {
@@ -657,6 +664,45 @@ void VID_UpdateGamma(qboolean force)
                        BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512);
                }
 
+               // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
+               // immensely butchered it to work with variable framerates and fit in with
+               // the rest of darkplaces.
+               if (v_psycho.integer)
+               {
+                       int x, y;
+                       float t;
+                       static float n[3], nd[3], nt[3];
+                       static int init = true;
+                       unsigned short *ramp;
+                       forcenextframe = true;
+                       if (init)
+                       {
+                               init = false;
+                               for (x = 0;x < 3;x++)
+                               {
+                                       n[x] = lhrandom(0, 1);
+                                       nd[x] = (rand()&1)?-0.25:0.25;
+                                       nt[x] = lhrandom(1, 8.2);
+                               }
+                       }
+                       
+                       for (x = 0;x < 3;x++)
+                       {
+                               nt[x] -= host_realframetime;
+                               if (nt[x] < 0)
+                               {
+                                       nd[x] = -nd[x];
+                                       nt[x] += lhrandom(1, 8.2);
+                               }
+                               n[x] += nd[x] * host_realframetime;
+                               n[x] -= floor(n[x]);
+                       }
+               
+                       for (x = 0, ramp = vid_gammaramps;x < 3;x++)
+                               for (y = 0, t = n[x] - 0.75f;y < 256;y++, t += 0.75f * (2.0f / 256.0f))
+                                       *ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f;
+               }
+
                Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps));
        }
        else
@@ -697,6 +743,8 @@ void VID_Shared_Init(void)
        Cvar_RegisterVariable(&v_color_white_b);
 
        Cvar_RegisterVariable(&v_hwgamma);
+       
+       Cvar_RegisterVariable(&v_psycho);
 
        Cvar_RegisterVariable(&vid_fullscreen);
        Cvar_RegisterVariable(&vid_width);
@@ -717,7 +765,6 @@ int current_vid_fullscreen;
 int current_vid_width;
 int current_vid_height;
 int current_vid_bitsperpixel;
-extern int VID_InitMode (int fullscreen, int width, int height, int bpp);
 int VID_Mode(int fullscreen, int width, int height, int bpp)
 {
        Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp);