From 617cd3b08962b925a5f3e733c10e6939b9be4d0b Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 16 Jun 2022 09:35:46 -0400 Subject: [PATCH] consistency rename; texdata_t -> maptexdata_t --- include/qbsp/map.hh | 4 ++-- qbsp/map.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/qbsp/map.hh b/include/qbsp/map.hh index 287a66b2..423c591b 100644 --- a/include/qbsp/map.hh +++ b/include/qbsp/map.hh @@ -113,7 +113,7 @@ public: const mapbrush_t &mapbrush(int i) const; }; -struct texdata_t +struct maptexdata_t { std::string name; surfflags_t flags; @@ -132,7 +132,7 @@ struct mapdata_t 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/map.cc b/qbsp/map.cc index ffbcc4c6..25f3fe75 100644 --- a/qbsp/map.cc +++ b/qbsp/map.cc @@ -179,7 +179,7 @@ int FindMiptex(const char *name, std::optional &extended_inf } for (i = 0; i < map.miptex.size(); i++) { - const texdata_t &tex = map.miptex.at(i); + const maptexdata_t &tex = map.miptex.at(i); if (!Q_strcasecmp(name, tex.name.c_str())) { return i; @@ -206,7 +206,7 @@ int FindMiptex(const char *name, std::optional &extended_inf } for (i = 0; i < map.miptex.size(); i++) { - const texdata_t &tex = map.miptex.at(i); + const maptexdata_t &tex = map.miptex.at(i); if (!Q_strcasecmp(name, tex.name.c_str()) && tex.flags.native == extended_info->flags.native && tex.value == extended_info->value && tex.animation == extended_info->animation) {