qbsp: fix name conflict with miptex_t (qbsp used it as a std::string alias)
This commit is contained in:
parent
09d7b6e73f
commit
00cdc2924a
|
|
@ -99,8 +99,6 @@ typedef struct {
|
|||
int32_t dataofs[]; /* [nummiptex] */
|
||||
} dmiptexlump_t;
|
||||
|
||||
typedef std::string miptex_t;
|
||||
|
||||
typedef struct {
|
||||
float point[3];
|
||||
} dvertex_t;
|
||||
|
|
|
|||
|
|
@ -127,13 +127,15 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
using texname_t = std::string;
|
||||
|
||||
typedef struct mapdata_s {
|
||||
/* Arrays of actual items */
|
||||
std::vector<mapface_t> faces;
|
||||
std::vector<mapbrush_t> brushes;
|
||||
std::vector<mapentity_t> entities;
|
||||
std::vector<qbsp_plane_t> planes;
|
||||
std::vector<miptex_t> miptex;
|
||||
std::vector<texname_t> miptex;
|
||||
std::vector<mtexinfo_t> mtexinfos;
|
||||
|
||||
/* quick lookup for texinfo */
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ const int *MemSize = MemSize_BSP29;
|
|||
sizeof(surface_t), \
|
||||
sizeof(node_t), \
|
||||
sizeof(brush_t), \
|
||||
sizeof(miptex_t), \
|
||||
sizeof(texname_t), \
|
||||
sizeof(wvert_t), \
|
||||
sizeof(wedge_t), \
|
||||
sizeof(hashvert_t), \
|
||||
|
|
|
|||
Loading…
Reference in New Issue