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

Catch2 to 3.x again? 

fix merge issue
This commit is contained in:
Jonathan 2022-06-30 05:45:23 -04:00
parent f7016d1af0
commit 74c2bb3385
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/Catch2 vendored

@ -1 +1 @@
Subproject commit 62fd660583d3ae7a7886930b413c3c570e89786c
Subproject commit 5a1ef7e4a6caf3d5f696eb82302e3d87ff5c2303

6
common/bspfile.cc
View File

@ -97,8 +97,7 @@ public:
return (flags.native & ~TEX_SPECIAL) == 0;
}
bool texinfo_is_hintskip(const surfflags_t &flags, const std::string &name) const override
int32_t surfflags_from_string(const std::string_view &str) const
int32_t surfflags_from_string(const std::string_view &str) const override
{
if (string_iequals(str, "special")) {
return TEX_SPECIAL;
@ -107,7 +106,8 @@ public:
return 0;
}
bool texinfo_is_hintskip(const surfflags_t &flags, const std::string &name) const override {
bool texinfo_is_hintskip(const surfflags_t &flags, const std::string &name) const override
{
// anything texname other than "hint" in a hint brush is treated as "hintskip", and discarded
return !string_iequals(name, "hint");
}