eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

This should fix the pentacles. Though it might break non-mission-pack monsters/maps.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3595 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2010-08-18 21:59:06 +00:00
parent c9848cbcfc
commit 6455e98327
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/common/q1bsp.c
View file

@ -393,6 +393,8 @@ qboolean Q1BSP_Trace(model_t *model, int forcehullnum, int frame, vec3_t start,
if (size[0] < 3) // Point if (size[0] < 3) // Point
hull = &model->hulls[0]; hull = &model->hulls[0];
else if (size[0] <= 8 && model->hulls[4].available)
hull = &model->hulls[4]; //Pentacles
else if (size[0] <= 32 && size[2] <= 28) // Half Player else if (size[0] <= 32 && size[2] <= 28) // Half Player
hull = &model->hulls[3]; hull = &model->hulls[3];
else if (size[0] <= 32) // Full Player else if (size[0] <= 32) // Full Player

19
engine/gl/gl_model.c
View file

@ -2304,17 +2304,22 @@ qboolean RMod_LoadClipnodes (lump_t *l)
hull->clip_maxs[2] = 16; hull->clip_maxs[2] = 16;
hull->available = true; hull->available = true;
/*
There is some mission-pack weirdness here
in the missionpack, hull 4 is meant to be '-8 -8 -8' '8 8 8'
in the original game, hull 4 is '-40 -40 -42' '40 40 42'
*/
hull = &loadmodel->hulls[4]; hull = &loadmodel->hulls[4];
hull->clipnodes = out; hull->clipnodes = out;
hull->firstclipnode = 0; hull->firstclipnode = 0;
hull->lastclipnode = count-1; hull->lastclipnode = count-1;
hull->planes = loadmodel->planes; hull->planes = loadmodel->planes;
hull->clip_mins[0] = -40; hull->clip_mins[0] = -8;
hull->clip_mins[1] = -40; hull->clip_mins[1] = -8;
hull->clip_mins[2] = -42; hull->clip_mins[2] = -8;
hull->clip_maxs[0] = 40; hull->clip_maxs[0] = 8;
hull->clip_maxs[1] = 40; hull->clip_maxs[1] = 8;
hull->clip_maxs[2] = 42; hull->clip_maxs[2] = 8;
hull->available = true; hull->available = true;
hull = &loadmodel->hulls[5]; hull = &loadmodel->hulls[5];
@ -2324,7 +2329,7 @@ qboolean RMod_LoadClipnodes (lump_t *l)
hull->planes = loadmodel->planes; hull->planes = loadmodel->planes;
hull->clip_mins[0] = -48; hull->clip_mins[0] = -48;
hull->clip_mins[1] = -48; hull->clip_mins[1] = -48;
hull->clip_mins[2] = -50 - 24; hull->clip_mins[2] = -50;
hull->clip_maxs[0] = 48; hull->clip_maxs[0] = 48;
hull->clip_maxs[1] = 48; hull->clip_maxs[1] = 48;
hull->clip_maxs[2] = 50; hull->clip_maxs[2] = 50;