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' into brushbsp

This commit is contained in:
Eric Wasylishen 2022-05-18 23:17:40 -06:00
parent b21b7466ce b63eb11275
commit f8c227acbf
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsputil/decompile.cpp
View File

@ -222,7 +222,7 @@ struct compiled_brush_t
side.valve.shift[0], side.valve.axis.at(1, 0), side.valve.axis.at(1, 1), side.valve.axis.at(1, 2),
side.valve.shift[1], 0.0, side.valve.scale[0], side.valve.scale[1]);
if (contents.native || side.flags.native || side.value) {
if (bsp->loadversion->game->id == GAME_QUAKE_II && (contents.native || side.flags.native || side.value)) {
wal_metadata_t *meta = nullptr;
auto it = wals.find(side.texture_name);

14
include/qbsp/qbsp.hh
View File

@ -109,15 +109,15 @@ public:
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (auto value = parseString(parser)) {
if (changeSource(locked ? source::COMMANDLINE : source::MAP)) {
_paths.insert(wadpath{fs::path(*value), settingName[0] == 'x'});
}
return true;
if (!parser.parse_token()) {
return false;
}
return false;
if (changeSource(locked ? source::COMMANDLINE : source::MAP)) {
_paths.insert(wadpath{fs::path(parser.token), settingName[0] == 'x'});
}
return true;
}
std::string stringValue() const override