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

add entity lump replacement to bsputil

This commit is contained in:
Jonathan 2022-01-29 10:15:50 -05:00
parent 15484b55f8
commit 686cdf4217
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bsputil/bsputil.cc
View File

@ -465,7 +465,7 @@ int main(int argc, char **argv)
printf("---- bsputil / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n"); printf("---- bsputil / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n");
if (argc == 1) { if (argc == 1) {
printf( printf(
"usage: bsputil [--extract-entities] [--extract-textures] [--convert bsp29|bsp2|bsp2rmq|q2bsp] [--check] [--modelinfo]\n" "usage: bsputil [--replace-entities] [--extract-entities] [--extract-textures] [--convert bsp29|bsp2|bsp2rmq|q2bsp] [--check] [--modelinfo]\n"
"[--check] [--compare otherbsp] [--findfaces x y z nx ny nz] [--settexinfo facenum texinfonum]\n" "[--check] [--compare otherbsp] [--findfaces x y z nx ny nz] [--settexinfo facenum texinfonum]\n"
"[--decompile] [--decompile-geomonly] bspfile\n"); "[--decompile] [--decompile-geomonly] bspfile\n");
exit(1); exit(1);
@ -482,7 +482,25 @@ int main(int argc, char **argv)
ConvertBSPFormat(&bspdata, &bspver_generic); ConvertBSPFormat(&bspdata, &bspver_generic);
for (int32_t i = 0; i < argc - 1; i++) { for (int32_t i = 0; i < argc - 1; i++) {
if (!strcmp(argv[i], "--compare")) { if (!strcmp(argv[i], "--replace-entities")) {
i++;
if (i == argc - 1) {
Error("--replace-entities requires two arguments");
}
// Load the .ent
fs::data ent = fs::load(argv[i]);
if (!ent) {
Error("couldn't load ent file {}", argv[i]);
}
std::get<mbsp_t>(bspdata.bsp).dentdata = std::string(reinterpret_cast<char *>(ent->data()), ent->size());
ConvertBSPFormat(&bspdata, bspdata.loadversion);
WriteBSPFile(source, &bspdata);
} else if (!strcmp(argv[i], "--compare")) {
i++; i++;
if (i == argc - 1) { if (i == argc - 1) {
Error("--compare requires two arguments"); Error("--compare requires two arguments");