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

Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup

This commit is contained in:
Jonathan 2022-01-22 17:55:42 -05:00
parent 8dbb18cc94 c31edc6599
commit 6895fea115
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qbsp/map.cc
View File

@ -193,13 +193,15 @@ int FindMiptex(const char *name, std::optional<extended_texinfo_t> &extended_inf
if (!internal && !extended_info.has_value()) {
wal = LoadWal(name);
if (!wal.has_value()) {
extended_info = extended_texinfo_t{};
} else {
if (wal) {
extended_info = extended_texinfo_t{wal->contents, wal->flags, wal->value};
}
}
if (!extended_info.has_value()) {
extended_info = extended_texinfo_t{};
}
for (i = 0; i < map.nummiptex(); i++) {
const texdata_t &tex = map.miptex.at(i);