fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Fix some stringop-truncation warnings. Enable static freetype in config_fteqw.h. Fix wastes build.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5318 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-10-13 06:20:49 +00:00
parent 49ae9573b8
commit b68a6218e8
23 changed files with 180 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engine/server/world.c
View file

@ -479,7 +479,7 @@ void World_TouchLinks (world_t *w, wedict_t *ent, areanode_t *node)
if (!((int)ent->xv->dimension_solid & (int)touch->xv->dimension_hit)) //didn't change did it?...
continue;
w->Event_Touch(w, touch, ent);
w->Event_Touch(w, touch, ent, NULL);
if (ED_ISFREE(ent))
break;
@ -2242,9 +2242,7 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
{
touch = &pe->entities[i];
if (touch->solidsize == ES_SOLID_NOT)
continue;
else if (touch->solidsize == ES_SOLID_BSP)
if (touch->solidsize == ES_SOLID_BSP)
{
switch(touch->skinnum)
{
@ -2261,6 +2259,12 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
VectorCopy(model->mins, bmins);
VectorCopy(model->maxs, bmaxs);
}
#if 1
else
continue; //only hit brush ents.
#else
else if (touch->solidsize == ES_SOLID_NOT)
continue;
else
{
if (clip->type & MOVE_NOMONSTERS)
@ -2269,6 +2273,7 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
model = NULL;
COM_DecodeSize(touch->solidsize, bmins, bmaxs);
}
#endif
if (!(clip->hitcontentsmask & touchcontents))
continue;
@ -2325,7 +2330,10 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
if (clip->trace.startsolid && !trace.startsolid)
trace.ent = clip->trace.ent; //something else hit earlier, that one gets the trace entity, but not the fraction. yeah, combining traces like this was always going to be weird.
else
trace.ent = touch;
{
trace.ent = NULL;
clip->trace.entnum = touch->number;
}
clip->trace = trace;
}
else if (trace.startsolid || trace.allsolid)
@ -2336,7 +2344,8 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
if (!clip->trace.ent || trace.fraction == clip->trace.fraction) //xonotic requires that second test (DP has no check at all, which would end up reporting mismatched fraction/ent results, so yuck).
{
clip->trace.contents = trace.contents;
clip->trace.ent = touch;
clip->trace.ent = NULL;
clip->trace.entnum = touch->number;
}
}
}