Skip to content

Commit a431609

Browse files
committed
engine: update Mod_PointInLeaf signature for RefAPI
1 parent 526a3dc commit a431609

6 files changed

Lines changed: 6 additions & 11 deletions

File tree

engine/client/ref_common.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,6 @@ static qboolean R_Init_Video_( ref_graphic_apis_t type )
322322
return R_Init_Video( type );
323323
}
324324

325-
static mleaf_t *pfnMod_PointInLeaf( const vec3_t p, mnode_t *node )
326-
{
327-
// FIXME: get rid of this on next RefAPI update
328-
return Mod_PointInLeaf( p, node, cl.models[1] );
329-
}
330325

331326
static const ref_api_t gEngfuncs =
332327
{
@@ -368,7 +363,7 @@ static const ref_api_t gEngfuncs =
368363

369364
Mod_SampleSizeForFace,
370365
Mod_BoxVisible,
371-
pfnMod_PointInLeaf,
366+
Mod_PointInLeaf,
372367
R_DrawWorldHull,
373368
R_DrawModelHull,
374369

engine/ref_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ typedef struct ref_api_s
397397
// brushes
398398
int (*Mod_SampleSizeForFace)( const struct msurface_s *surf );
399399
qboolean (*Mod_BoxVisible)( const vec3_t mins, const vec3_t maxs, const byte *visbits );
400-
mleaf_t *(*Mod_PointInLeaf)( const vec3_t p, mnode_t *node );
400+
mleaf_t *(*Mod_PointInLeaf)( const vec3_t p, mnode_t *node, struct model_s *mod );
401401
void (*R_DrawWorldHull)( void );
402402
void (*R_DrawModelHull)( model_t *mod );
403403

ref/gl/gl_rmain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ R_FindViewLeaf
511511
void R_FindViewLeaf( void )
512512
{
513513
RI.oldviewleaf = RI.viewleaf;
514-
RI.viewleaf = gEngfuncs.Mod_PointInLeaf( RI.rvp.vieworigin, WORLDMODEL->nodes );
514+
RI.viewleaf = gEngfuncs.Mod_PointInLeaf( RI.rvp.vieworigin, WORLDMODEL->nodes, WORLDMODEL );
515515
}
516516

517517
/*

ref/gl/gl_rsurf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3770,7 +3770,7 @@ void R_MarkLeaves( void )
37703770
else
37713771
VectorSet( test, RI.rvp.vieworigin[0], RI.rvp.vieworigin[1], RI.rvp.vieworigin[2] + 16.0f );
37723772

3773-
leaf = gEngfuncs.Mod_PointInLeaf( test, WORLDMODEL->nodes );
3773+
leaf = gEngfuncs.Mod_PointInLeaf( test, WORLDMODEL->nodes, WORLDMODEL );
37743774

37753775
if(( leaf->contents != CONTENTS_SOLID ) && ( RI.viewleaf != leaf ))
37763776
force = true;

ref/soft/r_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ R_FindViewLeaf
474474
void R_FindViewLeaf( void )
475475
{
476476
RI.oldviewleaf = RI.viewleaf;
477-
RI.viewleaf = gEngfuncs.Mod_PointInLeaf( RI.rvp.vieworigin, WORLDMODEL->nodes );
477+
RI.viewleaf = gEngfuncs.Mod_PointInLeaf( RI.rvp.vieworigin, WORLDMODEL->nodes, WORLDMODEL );
478478
}
479479

480480
/*

ref/soft/r_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ void R_SetupFrameQ( void )
293293
// current viewleaf
294294
if( FBitSet( RI.rvp.flags, RF_DRAW_WORLD ))
295295
{
296-
RI.viewleaf = gEngfuncs.Mod_PointInLeaf( RI.rvp.vieworigin, WORLDMODEL->nodes );
296+
RI.viewleaf = gEngfuncs.Mod_PointInLeaf( RI.rvp.vieworigin, WORLDMODEL->nodes, WORLDMODEL );
297297
r_viewcluster = RI.viewleaf->cluster;
298298
}
299299

0 commit comments

Comments
 (0)