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

testqbsp: fix textures not loading in tests

This commit is contained in:
Eric Wasylishen 2022-04-20 01:31:26 -06:00
parent 97692738c4
commit 133ee77fc5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qbsp/map.hh
View File

@ -148,6 +148,7 @@ struct mapdata_t
// misc // misc
int start_spots = 0; int start_spots = 0;
bool wadlist_tried_loading = false;
// helpers // helpers
const std::string &miptexTextureName(int mt) const { return miptex.at(mt).name; } const std::string &miptexTextureName(int mt) const { return miptex.at(mt).name; }

6
qbsp/qbsp.cc
View File

@ -1041,14 +1041,12 @@ static void CreateHulls(void)
} }
} }
static bool wadlist_tried_loading = false;
void EnsureTexturesLoaded() void EnsureTexturesLoaded()
{ {
if (wadlist_tried_loading) if (map.wadlist_tried_loading)
return; return;
wadlist_tried_loading = true; map.wadlist_tried_loading = true;
const char *wadstring = ValueForKey(map.world_entity(), "_wad"); const char *wadstring = ValueForKey(map.world_entity(), "_wad");
if (!wadstring[0]) if (!wadstring[0])