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

qbsp: fix name conflict with miptex_t (qbsp used it as a std::string alias)

This commit is contained in:
Eric Wasylishen 2021-08-24 00:25:10 -06:00
parent 09d7b6e73f
commit 00cdc2924a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qbsp/bspfile.hh
View File

@ -99,8 +99,6 @@ typedef struct {
int32_t dataofs[]; /* [nummiptex] */ int32_t dataofs[]; /* [nummiptex] */
} dmiptexlump_t; } dmiptexlump_t;
typedef std::string miptex_t;
typedef struct { typedef struct {
float point[3]; float point[3];
} dvertex_t; } dvertex_t;

4
include/qbsp/map.hh
View File

@ -127,13 +127,15 @@ public:
} }
}; };
using texname_t = std::string;
typedef struct mapdata_s { typedef struct mapdata_s {
/* Arrays of actual items */ /* Arrays of actual items */
std::vector<mapface_t> faces; std::vector<mapface_t> faces;
std::vector<mapbrush_t> brushes; std::vector<mapbrush_t> brushes;
std::vector<mapentity_t> entities; std::vector<mapentity_t> entities;
std::vector<qbsp_plane_t> planes; std::vector<qbsp_plane_t> planes;
std::vector<miptex_t> miptex; std::vector<texname_t> miptex;
std::vector<mtexinfo_t> mtexinfos; std::vector<mtexinfo_t> mtexinfos;
/* quick lookup for texinfo */ /* quick lookup for texinfo */

2
qbsp/globals.cc
View File

@ -42,7 +42,7 @@ const int *MemSize = MemSize_BSP29;
sizeof(surface_t), \ sizeof(surface_t), \
sizeof(node_t), \ sizeof(node_t), \
sizeof(brush_t), \ sizeof(brush_t), \
sizeof(miptex_t), \ sizeof(texname_t), \
sizeof(wvert_t), \ sizeof(wvert_t), \
sizeof(wedge_t), \ sizeof(wedge_t), \
sizeof(hashvert_t), \ sizeof(hashvert_t), \