diff --git a/include/qbsp/bspfile.hh b/include/qbsp/bspfile.hh index 145e01d5..b836b476 100644 --- a/include/qbsp/bspfile.hh +++ b/include/qbsp/bspfile.hh @@ -99,8 +99,6 @@ typedef struct { int32_t dataofs[]; /* [nummiptex] */ } dmiptexlump_t; -typedef std::string miptex_t; - typedef struct { float point[3]; } dvertex_t; diff --git a/include/qbsp/map.hh b/include/qbsp/map.hh index b044d413..88cca092 100644 --- a/include/qbsp/map.hh +++ b/include/qbsp/map.hh @@ -127,13 +127,15 @@ public: } }; +using texname_t = std::string; + typedef struct mapdata_s { /* Arrays of actual items */ std::vector faces; std::vector brushes; std::vector entities; std::vector planes; - std::vector miptex; + std::vector miptex; std::vector mtexinfos; /* quick lookup for texinfo */ diff --git a/qbsp/globals.cc b/qbsp/globals.cc index ded3455b..b61e95aa 100644 --- a/qbsp/globals.cc +++ b/qbsp/globals.cc @@ -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), \