work, dammit!!
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1149 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
8a411cf73a
commit
4fad5d02bc
7 changed files with 12 additions and 6 deletions
|
@ -468,6 +468,8 @@ void PF_CL_drawline (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
float *pos = G_VECTOR(OFS_PARM4);
|
float *pos = G_VECTOR(OFS_PARM4);
|
||||||
int numpoints = *prinst->callargc-4;
|
int numpoints = *prinst->callargc-4;
|
||||||
|
|
||||||
|
#ifdef RGLQUAKE // :(
|
||||||
|
|
||||||
if (qrenderer == QR_OPENGL)
|
if (qrenderer == QR_OPENGL)
|
||||||
{
|
{
|
||||||
qglColor4f(rgb[0], rgb[1], rgb[2], alpha);
|
qglColor4f(rgb[0], rgb[1], rgb[2], alpha);
|
||||||
|
@ -480,6 +482,7 @@ void PF_CL_drawline (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
|
|
||||||
qglEnd();
|
qglEnd();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//vector drawgetimagesize(string pic) = #460;
|
//vector drawgetimagesize(string pic) = #460;
|
||||||
|
|
|
@ -3926,6 +3926,7 @@ void DrawParticleTypes (void texturedparticles(particle_t *,part_type_t*), void
|
||||||
particletime += pframetime;
|
particletime += pframetime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef RGLQUAKE
|
||||||
void P_FlushRenderer(void)
|
void P_FlushRenderer(void)
|
||||||
{
|
{
|
||||||
qglDepthMask(0); //primarily to stop close particles from obscuring each other
|
qglDepthMask(0); //primarily to stop close particles from obscuring each other
|
||||||
|
@ -3935,6 +3936,7 @@ void P_FlushRenderer(void)
|
||||||
qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
lasttype = NULL;
|
lasttype = NULL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
===============
|
===============
|
||||||
|
|
|
@ -370,6 +370,10 @@ typedef struct hull_s
|
||||||
|
|
||||||
|
|
||||||
void Q1BSP_SetHullFuncs(hull_t *hull);
|
void Q1BSP_SetHullFuncs(hull_t *hull);
|
||||||
|
qboolean Q1BSP_Trace(struct model_s *model, int forcehullnum, int frame, vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, struct trace_s *trace);
|
||||||
|
void Q1BSP_FatPVS (vec3_t org, qboolean add);
|
||||||
|
qboolean Q1BSP_EdictInFatPVS(struct edict_s *ent);
|
||||||
|
void Q1BSP_FindTouchedLeafs(struct edict_s *ent);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
==============================================================================
|
==============================================================================
|
||||||
|
|
|
@ -3715,7 +3715,6 @@ void PF_droptofloor (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
end[2] -= 512;
|
end[2] -= 512;
|
||||||
|
|
||||||
VectorCopy (ent->v->origin, start);
|
VectorCopy (ent->v->origin, start);
|
||||||
start[2] += 1;
|
|
||||||
trace = SV_Move (start, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
|
trace = SV_Move (start, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
|
||||||
|
|
||||||
if (trace.fraction == 1 || trace.allsolid)
|
if (trace.fraction == 1 || trace.allsolid)
|
||||||
|
|
|
@ -1220,10 +1220,6 @@ void Mod_LoadPlanes (lump_t *l)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Q1BSP_FatPVS (vec3_t org, qboolean add);
|
|
||||||
qboolean Q1BSP_EdictInFatPVS(struct edict_s *ent);
|
|
||||||
void Q1BSP_FindTouchedLeafs(struct edict_s *ent);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
=================
|
=================
|
||||||
Mod_LoadBrushModel
|
Mod_LoadBrushModel
|
||||||
|
@ -1300,6 +1296,7 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
|
||||||
|
|
||||||
mod->funcs.LeafForPoint = Mod_LeafForPoint;
|
mod->funcs.LeafForPoint = Mod_LeafForPoint;
|
||||||
mod->funcs.LeafPVS = Mod_LeafnumPVS;
|
mod->funcs.LeafPVS = Mod_LeafnumPVS;
|
||||||
|
mod->funcs.Trace = Q1BSP_Trace;
|
||||||
|
|
||||||
|
|
||||||
mod->numframes = 2; // regular and alternate animation
|
mod->numframes = 2; // regular and alternate animation
|
||||||
|
|
|
@ -1732,7 +1732,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
|
||||||
clip.end = end;
|
clip.end = end;
|
||||||
clip.mins = mins;
|
clip.mins = mins;
|
||||||
clip.maxs = maxs;
|
clip.maxs = maxs;
|
||||||
clip.type = type|4;
|
clip.type = type;
|
||||||
clip.passedict = passedict;
|
clip.passedict = passedict;
|
||||||
clip.hullnum = hullnum;
|
clip.hullnum = hullnum;
|
||||||
#ifdef Q2SERVER
|
#ifdef Q2SERVER
|
||||||
|
|
|
@ -1972,6 +1972,7 @@ void SWMod_LoadBrushModel (model_t *mod, void *buffer)
|
||||||
|
|
||||||
mod->funcs.LeafForPoint = SWMod_LeafForPoint;
|
mod->funcs.LeafForPoint = SWMod_LeafForPoint;
|
||||||
mod->funcs.LeafPVS = SWMod_LeafnumPVS;
|
mod->funcs.LeafPVS = SWMod_LeafnumPVS;
|
||||||
|
mod->funcs.Trace = Q1BSP_Trace;
|
||||||
|
|
||||||
//We ONLY do this for the world model
|
//We ONLY do this for the world model
|
||||||
#ifndef SERVERONLY
|
#ifndef SERVERONLY
|
||||||
|
|
Loading…
Reference in a new issue