RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: merge PM_TraceTexture into PM_TraceTexturePmove

Browse Source
This commit is contained in:
Alibek Omarov
2023-01-05 23:59:31 +03:00
parent 4cb109abe0
commit e305b81df0
5 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/common/pm_trace.c
View File

@@ -841,12 +841,19 @@ struct msurface_s *PM_TraceSurfacePmove( playermove_t *pmove, int ground, float
return PM_TraceSurface( &pmove->physents[ground], vstart, vend );
}
const char *PM_TraceTexturePmove( playermove_t *pmove, int ground, float *vstart, float *vend )
const char *PM_TraceTexture( playermove_t *pmove, int ground, float *vstart, float *vend )
{
msurface_t *surf;
if( ground < 0 || ground >= pmove->numphysent )
return NULL; // bad ground
return PM_TraceTexture( &pmove->physents[ground], vstart, vend );
surf = PM_TraceSurface( &pmove->physents[ground], vstart, vend );
if( !surf || !surf->texinfo || !surf->texinfo->texture )
return NULL;
return surf->texinfo->texture->name;
}
int PM_PointContentsPmove( playermove_t *pmove, const float *p, int *truecontents )