From 067a1e964b7195ec4ac1beff37995a81dceefe3f Mon Sep 17 00:00:00 2001 From: Saga port Date: Thu, 19 Nov 2026 11:03:57 +0100 Subject: [PATCH] Cutscene and IFF tables: scope +nocreate to its own entry parse_cutscene_table() and parse_iff_table() declared create_if_not_found once per file. After one +nocreate entry in a modular table, every later entry naming a new cutscene or IFF was skipped. Declare the flag inside the per-entry loop, as the other +nocreate parsers do. --- code/cutscene/cutscenes.cpp | 2 +- code/iff_defs/iff_defs.cpp | 2 +- test/src/cutscene/test_cutscene_parse.cpp | 32 +++++++++++++++++++ test/src/iff_defs/test_iff_accessibility.cpp | 2 ++ test/src/source_groups.cmake | 4 +++ .../cutscene/data/tables/cutscenes.tbl | 6 ++++ .../cutscene/data/tables/nocreate-csn.tbm | 14 ++++++++ .../tbm_adds_iff/data/tables/pirate-iff.tbm | 9 ++++-- 8 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 test/src/cutscene/test_cutscene_parse.cpp create mode 100644 test/test_data/cutscene/data/tables/cutscenes.tbl create mode 100644 test/test_data/cutscene/data/tables/nocreate-csn.tbm diff --git a/code/cutscene/cutscenes.cpp b/code/cutscene/cutscenes.cpp index 32609c792fc..8011b3ea71a 100644 --- a/code/cutscene/cutscenes.cpp +++ b/code/cutscene/cutscenes.cpp @@ -91,7 +91,6 @@ void parse_cutscene_table(const char* filename) cutscene_info_init(&csnt); cutscene_info *csnp; - bool create_if_not_found = true; try { @@ -106,6 +105,7 @@ void parse_cutscene_table(const char* filename) while (required_string_either("#End", "$Filename:")) { + bool create_if_not_found = true; bool csn_new = false; required_string("$Filename:"); diff --git a/code/iff_defs/iff_defs.cpp b/code/iff_defs/iff_defs.cpp index 16378f3f16f..64598cf2f6d 100644 --- a/code/iff_defs/iff_defs.cpp +++ b/code/iff_defs/iff_defs.cpp @@ -269,7 +269,6 @@ void parse_iff_table(const char* filename) iff_info ifft; iff_info* iffp; int cur_iff; - bool create_if_not_found = true; try { @@ -455,6 +454,7 @@ void parse_iff_table(const char* filename) // begin reading data while (required_string_either("#End", "$IFF Name:")) { + bool create_if_not_found = true; // get the iff name required_string("$IFF Name:"); diff --git a/test/src/cutscene/test_cutscene_parse.cpp b/test/src/cutscene/test_cutscene_parse.cpp new file mode 100644 index 00000000000..62cb48ae49f --- /dev/null +++ b/test/src/cutscene/test_cutscene_parse.cpp @@ -0,0 +1,32 @@ +#include "cutscene/cutscenes.h" +#include "util/FSTestFixture.h" + +#include + +// Defined in cutscenes.cpp for shutdown; reuse it to free test descriptions. +void cutscene_close(); + +class CutsceneParseTest : public test::FSTestFixture { + public: + CutsceneParseTest() : test::FSTestFixture(INIT_CFILE) + { + pushModDir("cutscene"); + } + + protected: + void TearDown() override + { + cutscene_close(); + Cutscenes.clear(); + test::FSTestFixture::TearDown(); + } +}; + +TEST_F(CutsceneParseTest, ModularNocreateAppliesOnlyToItsEntry) +{ + cutscene_init(); + + EXPECT_GE(get_cutscene_index_by_name("Intro Override"), 0); + EXPECT_GE(get_cutscene_index_by_name("New Cutscene"), 0); + EXPECT_LT(get_cutscene_index_by_name("Missing Cutscene"), 0); +} diff --git a/test/src/iff_defs/test_iff_accessibility.cpp b/test/src/iff_defs/test_iff_accessibility.cpp index 2975b0efadc..e211299b36d 100644 --- a/test/src/iff_defs/test_iff_accessibility.cpp +++ b/test/src/iff_defs/test_iff_accessibility.cpp @@ -36,8 +36,10 @@ TEST_F(IffAccessibilityTest, TbmIffsKeepTheirColorsAndBuiltInsUseAccessibilityCo { iff_init(); + // Pirate follows a +nocreate override in pirate-iff.tbm, so this checks that +nocreate applies only to its own entry. const int pirate = iff_lookup("Pirate"); const int friendly = iff_lookup("Friendly"); + EXPECT_LT(iff_lookup("Missing IFF"), 0); ASSERT_GE(pirate, 0); ASSERT_GE(friendly, 0); diff --git a/test/src/source_groups.cmake b/test/src/source_groups.cmake index 5fd968b8dc8..cc444cefe26 100644 --- a/test/src/source_groups.cmake +++ b/test/src/source_groups.cmake @@ -25,6 +25,10 @@ add_file_folder("Controlconfig" controlconfig/test_bindings.cpp ) +add_file_folder("Cutscene" + cutscene/test_cutscene_parse.cpp +) + add_file_folder("Globalincs" globalincs/test_flagset.cpp globalincs/test_polymorphic.cpp diff --git a/test/test_data/cutscene/data/tables/cutscenes.tbl b/test/test_data/cutscene/data/tables/cutscenes.tbl new file mode 100644 index 00000000000..48367e8a44d --- /dev/null +++ b/test/test_data/cutscene/data/tables/cutscenes.tbl @@ -0,0 +1,6 @@ +#Cutscenes + +$Filename: intro.mve +$Name: Introduction + +#End diff --git a/test/test_data/cutscene/data/tables/nocreate-csn.tbm b/test/test_data/cutscene/data/tables/nocreate-csn.tbm new file mode 100644 index 00000000000..89bfcc100f1 --- /dev/null +++ b/test/test_data/cutscene/data/tables/nocreate-csn.tbm @@ -0,0 +1,14 @@ +#Cutscenes + +$Filename: intro.mve ++nocreate +$Name: Intro Override + +$Filename: new.mve +$Name: New Cutscene + +$Filename: missing.mve ++nocreate +$Name: Missing Cutscene + +#End diff --git a/test/test_data/iff/tbm_adds_iff/data/tables/pirate-iff.tbm b/test/test_data/iff/tbm_adds_iff/data/tables/pirate-iff.tbm index 7a550523c45..eb12653c35f 100644 --- a/test/test_data/iff/tbm_adds_iff/data/tables/pirate-iff.tbm +++ b/test/test_data/iff/tbm_adds_iff/data/tables/pirate-iff.tbm @@ -1,11 +1,16 @@ #IFFs +; Pirate follows this +nocreate override to check that +nocreate applies only to its own entry. +$IFF Name: Unknown ++nocreate +$Color: ( 0, 0, 255 ) + $IFF Name: Pirate $Color: ( 200, 0, 200 ) $Attacks: ( "Friendly" ) +Sees Friendly As: ( 250, 250, 0 ) -$IFF Name: Unknown -$Color: ( 0, 0, 255 ) +$IFF Name: Missing IFF ++nocreate #End