olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bsputils: add more bounds-checked accessors

This commit is contained in:
Eric Wasylishen 2017-11-23 01:05:27 -07:00
parent 88ee157b97
commit f356ea40d1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/bsputils.cc
View File

@ -42,6 +42,18 @@ int Face_GetNum(const mbsp_t *bsp, const bsp2_dface_t *f)
return static_cast<int>(diff);
}
const bsp2_dnode_t *BSP_GetNode(const mbsp_t *bsp, int nodenum)
{
Q_assert(nodenum >= 0 && nodenum < bsp->numnodes);
return &bsp->dnodes[nodenum];
}
const dplane_t *BSP_GetPlane(const mbsp_t *bsp, int planenum)
{
Q_assert(planenum >= 0 && planenum < bsp->numplanes);
return &bsp->dplanes[planenum];
}
const bsp2_dface_t *BSP_GetFace(const mbsp_t *bsp, int fnum)
{
Q_assert(fnum >= 0 && fnum < bsp->numfaces);

5
include/common/bsputils.hh
View File

@ -28,8 +28,13 @@
const dmodel_t *BSP_GetWorldModel(const mbsp_t *bsp);
int Face_GetNum(const mbsp_t *bsp, const bsp2_dface_t *f);
// bounds-checked array access (assertion failure on out-of-bounds)
const bsp2_dnode_t *BSP_GetNode(const mbsp_t *bsp, int nodenum);
const dplane_t *BSP_GetPlane(const mbsp_t *bsp, int planenum);
const bsp2_dface_t *BSP_GetFace(const mbsp_t *bsp, int fnum);
bsp2_dface_t *BSP_GetFace(mbsp_t *bsp, int fnum);
int Face_VertexAtIndex(const mbsp_t *bsp, const bsp2_dface_t *f, int v);
void Face_PointAtIndex(const mbsp_t *bsp, const bsp2_dface_t *f, int v, vec3_t point_out);
plane_t Face_Plane(const mbsp_t *bsp, const bsp2_dface_t *f);