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

common: revert Face_Miptex change, it was breaking reading of 

Q1 texture names. TODO: fix this properly?
This commit is contained in:
Eric Wasylishen 2021-01-31 01:27:01 -07:00
parent 54525f4dae
commit 0cdd2f97ab
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/bsputils.cc
View File

@ -151,10 +151,10 @@ const gtexinfo_t *Face_Texinfo(const mbsp_t *bsp, const bsp2_dface_t *face)
return &bsp->texinfo[face->texinfo];
}
const rgba_miptex_t * //mxd. miptex_t -> rgba_miptex_t
const miptex_t *
Face_Miptex(const mbsp_t *bsp, const bsp2_dface_t *face)
{
if (!bsp->rgbatexdatasize)
if (!bsp->texdatasize)
return nullptr;
const gtexinfo_t *texinfo = Face_Texinfo(bsp, face);
@ -162,13 +162,13 @@ Face_Miptex(const mbsp_t *bsp, const bsp2_dface_t *face)
return nullptr;
const int texnum = texinfo->miptex;
const dmiptexlump_t *miplump = bsp->drgbatexdata;
const dmiptexlump_t *miplump = bsp->dtexdata;
const int offset = miplump->dataofs[texnum];
if (offset < 0)
return nullptr; //sometimes the texture just wasn't written. including its name.
const rgba_miptex_t *miptex = (const rgba_miptex_t*)((const byte *)bsp->drgbatexdata + offset);
const miptex_t *miptex = (const miptex_t*)((const byte *)bsp->dtexdata + offset);
return miptex;
}

2
include/common/bsputils.hh
View File

@ -43,7 +43,7 @@ void Face_PointAtIndex(const mbsp_t *bsp, const bsp2_dface_t *f, int v, vec3_t p
void Face_Normal(const mbsp_t *bsp, const bsp2_dface_t *f, vec3_t norm); //mxd
plane_t Face_Plane(const mbsp_t *bsp, const bsp2_dface_t *f);
const gtexinfo_t *Face_Texinfo(const mbsp_t *bsp, const bsp2_dface_t *face);
const rgba_miptex_t *Face_Miptex(const mbsp_t *bsp, const bsp2_dface_t *face); //mxd. miptex_t -> rgba_miptex_t
const miptex_t *Face_Miptex(const mbsp_t *bsp, const bsp2_dface_t *face); //mxd. miptex_t -> rgba_miptex_t
const char *Face_TextureName(const mbsp_t *bsp, const bsp2_dface_t *face);
bool Face_IsLightmapped(const mbsp_t *bsp, const bsp2_dface_t *face);
const float *GetSurfaceVertexPoint(const mbsp_t *bsp, const bsp2_dface_t *f, int v);