From 0cdd2f97ab95abf8a274378985665df00b96c78a Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 31 Jan 2021 01:27:01 -0700 Subject: [PATCH] common: revert Face_Miptex change, it was breaking reading of Q1 texture names. TODO: fix this properly? --- common/bsputils.cc | 8 ++++---- include/common/bsputils.hh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/bsputils.cc b/common/bsputils.cc index fee0508d..df9147f0 100644 --- a/common/bsputils.cc +++ b/common/bsputils.cc @@ -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; } diff --git a/include/common/bsputils.hh b/include/common/bsputils.hh index 2457bab9..e198b824 100644 --- a/include/common/bsputils.hh +++ b/include/common/bsputils.hh @@ -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);