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 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp

This commit is contained in:
Jonathan 2022-06-22 14:43:57 -04:00
parent dfdd568974 c054db0f48
commit 0fa779afaa
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/parser.cc
View File

@ -57,7 +57,7 @@ skipspace:
} }
/* comment field */ /* comment field */
if (pos[0] == '/' && pos[1] == '/') { if ((pos[0] == '/' && pos[1] == '/') || pos[0] == ';') { // quark writes ; comments in q2 maps
if (flags & PARSE_COMMENT) { if (flags & PARSE_COMMENT) {
while (*pos && *pos != '\n') { while (*pos && *pos != '\n') {
*token_p++ = *pos++; *token_p++ = *pos++;

2
qbsp/qbsp.cc
View File

@ -904,7 +904,7 @@ static void ProcessEntity(mapentity_t *entity, const int hullnum)
FreeTreePortals_r(tree->headnode); FreeTreePortals_r(tree->headnode);
PruneNodes(tree->headnode); PruneNodes(tree->headnode);
if (hullnum <= 0 && entity == map.world_entity() && !map.leakfile) { if (hullnum <= 0 && entity == map.world_entity() && (!map.leakfile || options.keepprt.value())) {
WritePortalFile(tree); WritePortalFile(tree);
} }

2
qbsp/test_qbsp.cc
View File

@ -169,7 +169,7 @@ static std::tuple<mbsp_t, bspxentries_t, std::optional<prtfile_t>> LoadTestmap(c
auto bsp_path = map_path; auto bsp_path = map_path;
bsp_path.replace_extension(".bsp"); bsp_path.replace_extension(".bsp");
std::vector<std::string> args{"", "-nopercent", "-keepprt"}; std::vector<std::string> args{"", "-nopercent"};
for (auto &arg : extra_args) { for (auto &arg : extra_args) {
args.push_back(arg); args.push_back(arg);
} }