remove some Blood Omnicide related hacks, fixed video stippling on ATI (always draw...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10201 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f55a2becba4b17fbd7335f20d64063d4dd437043

diff --git a/cl_video.c b/cl_video.c
index 90f93069e26e4a85588aba12e34e475e00a1530c..d893124c5c410769f11bc8719469b6033b604bbc 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -437,6 +437,10 @@ void CL_DrawVideo(void)
        if (cl_video_brightness.value <= 0 || cl_video_brightness.value > 10)
                Cvar_SetValueQuick( &cl_video_brightness, 1);
 
+       // draw black bg in case stipple is active or video is scaled
+       if (cl_video_stipple.integer || cl_video_scale.value != 1)
+               DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 1, 0);
+
        // enable video-only polygon stipple (of global stipple is not active)
        if (qglPolygonStipple && !scr_stipple.integer && cl_video_stipple.integer)
        {
@@ -464,7 +468,6 @@ void CL_DrawVideo(void)
                int py = (int)(vid_conheight.integer * (1 - cl_video_scale.value) * ((bound(-1, cl_video_scale_vpos.value, 1) + 1) / 2));
                int sx = (int)(vid_conwidth.integer * cl_video_scale.value);
                int sy = (int)(vid_conheight.integer * cl_video_scale.value);
-               DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 1, 0);
                DrawQ_Pic(px, py, &video->cpif, sx , sy, cl_video_brightness.value, cl_video_brightness.value, cl_video_brightness.value, 1, 0);
        }
 

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 554fb0fa2cbeccba0ee61346bf42ff791b7d30ad..e70c8d0a5eb69b3ffac6b210f7b2a17d36d21201 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -1309,8 +1309,7 @@ void R_ReplaceWorldTexture (void)
        skinframe_t *skinframe;
        if (!r_refdef.scene.worldmodel)
        {
-               if (gamemode != GAME_BLOODOMNICIDE)
-                       Con_Printf("There is no worldmodel\n");
+               Con_Printf("There is no worldmodel\n");
                return;
        }
        m = r_refdef.scene.worldmodel;
@@ -1323,8 +1322,7 @@ void R_ReplaceWorldTexture (void)
        }
        if(!cl.islocalgame || !cl.worldmodel)
        {
-               if (gamemode != GAME_BLOODOMNICIDE)
-                       Con_Print("This command works only in singleplayer\n");
+               Con_Print("This command works only in singleplayer\n");
                return;
        }
        r = Cmd_Argv(1);
@@ -1340,13 +1338,11 @@ void R_ReplaceWorldTexture (void)
 //                             t->skinframes[0] = skinframe;
                                t->currentskinframe = skinframe;
                                t->currentskinframe = skinframe;
-                               if (gamemode != GAME_BLOODOMNICIDE)
-                                       Con_Printf("%s replaced with %s\n", r, newt);
+                               Con_Printf("%s replaced with %s\n", r, newt);
                        }
                        else
                        {
-                               if (gamemode != GAME_BLOODOMNICIDE)
-                                       Con_Printf("%s was not found\n", newt);
+                               Con_Printf("%s was not found\n", newt);
                                return;
                        }
                }