From 2e7e886fa347e65f8c0dd5a7937cb5991735c806 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 20 Sep 2021 23:15:13 -0600 Subject: [PATCH] testmaps: -onlyents test --- testmaps/automatated_tests.sh | 20 +++++++++++++++++++- testmaps/qbsp-vis.sha256sum | 1 + testmaps/qbsp.sha256sum | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/testmaps/automatated_tests.sh b/testmaps/automatated_tests.sh index 7472920c..d5d976fa 100755 --- a/testmaps/automatated_tests.sh +++ b/testmaps/automatated_tests.sh @@ -42,7 +42,8 @@ e1m1-hexen2.bsp \ e1m1-hexen2-bsp2.bsp \ e1m1-hexen2-2psb.bsp \ e1m1-hlbsp.bsp \ -e1m1-bspxbrushes.bsp" +e1m1-bspxbrushes.bsp \ +e1m1-bsp29-onlyents.bsp" qbsp -noverbose quake_map_source/E1M1.map e1m1-bsp29.bsp || exit 1 qbsp -noverbose -bsp2 quake_map_source/E1M1.map e1m1-bsp2.bsp || exit 1 @@ -53,6 +54,23 @@ qbsp -noverbose -hexen2 -2psb quake_map_source/E1M1.map e1m1-hexen2-2psb.bsp || qbsp -noverbose -hlbsp quake_map_source/E1M1.map e1m1-hlbsp.bsp || exit 1 qbsp -noverbose -wrbrushes quake_map_source/E1M1.map e1m1-bspxbrushes.bsp || exit 1 +# -onlyents test: +# - start with a copy of e1m1-bsp29.bsp called e1m1-bsp29-onlyents.bsp +# - make a E1M1-edited-ents.map by adding an extra entity +# - patch e1m1-bsp29-onlyents.bsp with the entities lump from E1M1-edited-ents.map +cp e1m1-bsp29.bsp e1m1-bsp29-onlyents.bsp || exit 1 +cp e1m1-bsp29.prt e1m1-bsp29-onlyents.prt || exit 1 +cp quake_map_source/E1M1.map E1M1-edited-ents.map || exit 1 +cat << EOF >> E1M1-edited-ents.map +{ +"classname" "weapon_nailgun" +"origin" "112 2352 20" +"spawnflags" "2048" +} +EOF +qbsp -onlyents E1M1-edited-ents.map e1m1-bsp29-onlyents.bsp || exit 1 +rm E1M1-edited-ents.map || exit 1 + if [[ $UPDATE_HASHES -ne 0 ]]; then sha256sum ${HASH_CHECK_BSPS} > qbsp.sha256sum || exit 1 else diff --git a/testmaps/qbsp-vis.sha256sum b/testmaps/qbsp-vis.sha256sum index 425c3f10..8115c83d 100644 --- a/testmaps/qbsp-vis.sha256sum +++ b/testmaps/qbsp-vis.sha256sum @@ -6,3 +6,4 @@ f5656ae5a98b4044568e70a411afe2b37cae41c14f7262f26be2aa45aebc3672 *e1m1-hexen2.bs a5eb5b451baab8db48a141285479669656010fc7d3945e30672d609169b040e5 *e1m1-hexen2-2psb.bsp ecf7a82cfad86c3b8a330645233c17011f77b8fef844130ac85dd6e8972eea8f *e1m1-hlbsp.bsp ce687f32a1059eb60bfb2b3868dc5fa8446a62aefc40f9cb459d0242b16b39ef *e1m1-bspxbrushes.bsp +059a0003320f4f442552244cdde48784a92d45f698c42354bee1b27c1302ed84 *e1m1-bsp29-onlyents.bsp diff --git a/testmaps/qbsp.sha256sum b/testmaps/qbsp.sha256sum index 0f9db8d4..f75f1736 100644 --- a/testmaps/qbsp.sha256sum +++ b/testmaps/qbsp.sha256sum @@ -6,3 +6,4 @@ d289427e3c8a7046dce509a83401f6732a9c5f8194f8beb3eee431e33215656c *e1m1-bsp29.bsp 015c582d9a76ec0f911c5d5f2e7ebcc1ad01ee81860dd113222259f65a40e953 *e1m1-hexen2-2psb.bsp 66936b95d27716cbcb28bc6bf8a0191f8d53bc7e2823abcb85cd04fec9d2fcb6 *e1m1-hlbsp.bsp 015c5fb3f350dfb10c031ed3ae44b3e094fbde38c48dec0897d0710fcbc7666c *e1m1-bspxbrushes.bsp +530a11617a5f587a7da55ae4bd4299585001d3cd3c7ff5f874d2745e59c4ac98 *e1m1-bsp29-onlyents.bsp