eukara/ngunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SOLID_BSP error workaround

Browse source
This commit is contained in:
eukos 2015-08-31 22:32:45 +02:00
parent 4222820abe
commit 00034d7a7f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
engine/world.c
View file

@ -141,10 +141,10 @@ hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
model = sv.models[ (int)ent->v.modelindex ];
if (!model || model->type != mod_brush)
// 1999-10-07 MOVETYPE_PUSH fix by LordHavoc/Maddes start
// Sys_Error ("MOVETYPE_PUSH with a non bsp model");
Sys_Error ("SOLID_BSP with a non bsp model");
if (!model || model->type != mod_brush){
Con_Printf ("WARNING: SOLID_BSP with a non bsp model\n Changing it to SOLID_NOT\n");
ent->v.solid = SOLID_NOT;
}
// 1999-10-07 MOVETYPE_PUSH fix by LordHavoc/Maddes end
VectorSubtract (maxs, mins, size);

4
renderer/r_part.c
View file

@ -1720,7 +1720,7 @@ void R_FlareTest (vec3_t org, int decframe, int colr, int colg, int colb, float
// determine if we've spawned in a wall like an idiot would do.
mleaf_t *o;
mleaf_t *o;
o = Mod_PointInLeaf (org, cl.worldmodel);
if (o->contents != CONTENTS_EMPTY )
@ -4422,7 +4422,7 @@ void R_DrawFlares (void)
{
p->alphavel = -1.74;
}
model_t *hello;
if ((p->model = Mod_ForName("particle.spr", false)))
{
currentflare = p;