Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-07 20:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: look up the oldest zone files' scenes in a CDClient SceneTable table

Browse Source 
Zone held a std::function that queried the SceneTable, so tests could swap it out. CDSceneTableTable now loads the table with the others, and Zone looks scenes up in it; tests fill its entries like the zone table's.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-10-27 09:53:13 -05:00
parent 1c5c615670
commit 6b7396546a
7 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/dGameTests/dZoneManagerTests/ZoneFileVersionTests.cpp
View File

@@ -5,6 +5,7 @@
#include <sstream>
#include "AssetManager.h"
#include "CDSceneTableTable.h"
#include "CDZoneTableTable.h"
#include "Zone.h"
#include "dZoneManager.h"
@@ -14,6 +15,11 @@ namespace CDZoneTableTable {
extern Table entries;
}
// The scene table's storage (CDSceneTableTable.cpp), to add the scenes of the oldest zone files
namespace CDSceneTableTable {
extern Table entries;
}
namespace {
template<typename T>
void Write(std::ostream& stream, const T& value) {
@@ -93,11 +99,10 @@ protected:
TearDownDependencies();
}
Zone* LoadZone(const std::string& data, Zone::SceneTableLookup lookup = nullptr) const {
Zone* LoadZone(const std::string& data) const {
std::ofstream(root / "res" / "maps" / "testzone" / "test.luz", std::ios::binary).write(data.data(), data.size());
Game::zoneManager->LoadZone(LWOZONEID(TEST_MAP, 0, 0));
Zone* zone = Game::zoneManager->GetZoneMut();
if (lookup) zone->SetSceneTableLookup(std::move(lookup));
zone->LoadZoneIntoMemory();
return zone;
}
@@ -144,11 +149,9 @@ TEST_F(ZoneFileVersionTest, OldestScenesComeFromTheSceneTable) {
Write<uint8_t>(stream, 0); // boundary lines
WriteString8(stream, "test.raw");
Write<uint16_t>(stream, 0); // trailing bytes: older readers read a name and description here
const Zone* zone = LoadZone(stream.str(), [](uint32_t sceneTableID) -> std::optional<std::string> {
if (sceneTableID == 3) return "three.lvl";
if (sceneTableID == 7) return "seven.lvl";
return std::nullopt;
});
CDSceneTableTable::entries = { { 3, { 3, "three.lvl" } }, { 7, { 7, "seven.lvl" } } };
const Zone* zone = LoadZone(stream.str());
CDSceneTableTable::entries.clear();
const std::vector<std::pair<LWOSCENEID, std::string>> expected = { { LWOSCENEID(0, 0), "three.lvl" }, { LWOSCENEID(1, 0), "seven.lvl" } };
EXPECT_EQ(Scenes(zone), expected) << version;