fix: skip the wide null after a scene file particle's effect names

Before version 46 the u16 after a particle's effect names is the names'
wide null terminator, 0 in every shipped scene file. It is skipped
instead of kept as an unknown value.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-04 21:34:04 -06:00
parent c33d74f8c6
commit 7a90869ebd
3 changed files with 8 additions and 5 deletions

View File

@@ -291,8 +291,13 @@ void LevelFile::ReadParticles(std::istream& file) {
BinaryIO::BinaryRead(file, particle.position);
BinaryIO::BinaryRead(file, particle.rotation);
particle.effectNames = ReadWideString32(file);
if (version < 46) BinaryIO::BinaryRead(file, particle.unknown);
else config = ReadWideString32(file);
if (version < 46) {
// Before version 46 the effect names end with a wide null
uint16_t nameTerminator{};
BinaryIO::BinaryRead(file, nameTerminator);
} else {
config = ReadWideString32(file);
}
particle.config = config;
if (file.fail()) throw std::runtime_error("Failed to read from istream.");
// The client stops at a particle with no effect

View File

@@ -91,7 +91,6 @@ struct LevelParticle {
NiPoint3 position;
NiQuaternion rotation = QuatUtils::IDENTITY;
std::string effectNames; // separated by ';'
uint16_t unknown{}; // before version 46
// Version 46 on. The client keeps the last one it read for a particle without one
std::string config;
};

View File

@@ -103,7 +103,7 @@ namespace {
WriteFloats(stream, { 4.0f, 5.0f, 6.0f }); // position
WriteFloats(stream, { 1.0f, 0.0f, 0.0f, 0.0f }); // rotation, w first
WriteWString32(stream, names);
if (version < 46) Write<uint16_t>(stream, 9);
if (version < 46) Write<uint16_t>(stream, 0); // the names' wide null
else WriteWString32(stream, config);
}
@@ -286,7 +286,6 @@ TEST(LevelTests, ReadsAFileFromBeforeChunks) {
EXPECT_EQ(level.sounds[0].config.find(u"soundName")->second->GetValueAsString(), "birds");
ASSERT_EQ(level.particles.size(), 1);
EXPECT_EQ(level.particles[0].priority, 0); // only from version 43
EXPECT_EQ(level.particles[0].unknown, 9);
}
// Older lighting: fog distances only before 39, no directional colour before 36, and before 33 a fixed spawn point