qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-02-20 18:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pre-merge code commit. This bug will die.

Browse source
This commit is contained in:
Jeff Teunissen 1999-12-28 00:05:59 +00:00
parent f1cc8a1187
commit 33efb22b49
4 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
uquake/gl_refrag.c
View file

@ -135,7 +135,8 @@ void R_SplitEntityOnNode (mnode_t *node)
// NODE_MIXED
splitplane = node->plane;
sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
// sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
sides = BoxOnPlaneSide(r_emins, r_emaxs, splitplane);
if (sides == 3)
{

2
uquake/gl_rmain.c
View file

@ -1086,7 +1086,7 @@ r_refdef must be set before the first call
void R_RenderView (void)
{
double time1 = 0, time2 = 0;
//GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.20};
// GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.20};
if (r_norefresh.value)
return;

18
uquake/host.c
View file

@ -882,32 +882,14 @@ void Host_Init (quakeparms_t *parms)
if (!host_colormap)
Sys_Error ("Couldn't load gfx/colormap.lmp");
#ifndef _WIN32 // on non win32, mouse comes before video for security reasons
IN_Init ();
#endif
VID_Init (host_basepal);
Draw_Init ();
SCR_Init ();
R_Init ();
#ifndef _WIN32
// on Win32, sound initialization has to come before video initialization, so we
// can put up a popup if the sound hardware is in use
S_Init ();
#else
#ifdef GLQUAKE
// FIXME: doesn't use the new one-window approach yet
S_Init ();
#endif
#endif // _WIN32
CDAudio_Init ();
Sbar_Init ();
CL_Init ();
#ifdef _WIN32 // on non win32, mouse comes before video for security reasons
IN_Init ();
#endif
}
Cbuf_InsertText ("exec quake.rc\n");

16
uquake/world.c
View file

@ -657,14 +657,14 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec
if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) )
return false;
#ifdef PARANOID
if (SV_HullPointContents (sv_hullmodel, mid, node->children[side])
== CONTENTS_SOLID)
{
Con_Printf ("mid PointInHullSolid\n");
return false;
}
#endif
//#ifdef PARANOID
// if (SV_HullPointContents (sv_hullmodel, mid, node->children[side])
// == CONTENTS_SOLID)
// {
// Con_Printf ("mid PointInHullSolid\n");
// return false;
// }
//#endif
if (SV_HullPointContents (hull, node->children[side^1], mid)
!= CONTENTS_SOLID)