phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-04 08:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DBC: Correct extracting dbc info

Browse source
This commit is contained in:
kittnz 2026-02-23 21:27:56 +01:00
parent 06979e5c5c
commit bd33601eb3
5 changed files with 258 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/asset_extract/extractor.cpp
View file

@ -524,7 +524,7 @@ bool Extractor::enumerateFiles(const Options& opts,
for (auto it = archives.rbegin(); it != archives.rend(); ++it) {
HANDLE hMpq = nullptr;
if (!SFileOpenArchive(it->path.c_str(), 0, 0, &hMpq)) {
if (!SFileOpenArchive(it->path.c_str(), 0, MPQ_OPEN_READ_ONLY, &hMpq)) {
std::cerr << " Failed to open: " << it->path << "\n";
continue;
}
@ -634,8 +634,10 @@ bool Extractor::run(const Options& opts) {
std::vector<ThreadArchive> threadHandles;
for (const auto& ad : archives) {
HANDLE h = nullptr;
if (SFileOpenArchive(ad.path.c_str(), 0, 0, &h)) {
if (SFileOpenArchive(ad.path.c_str(), 0, MPQ_OPEN_READ_ONLY, &h)) {
threadHandles.push_back({h, ad.priority});
} else {
std::cerr << "Worker: failed to open " << ad.path << " (err=" << GetLastError() << ")\n";
}
}
if (threadHandles.empty()) {

8
tools/dbc_to_csv/main.cpp
View file

@ -44,6 +44,10 @@ std::vector<uint8_t> readFileBytes(const std::string& path) {
// Check whether offset points to a plausible string in the string block.
bool isValidStringOffset(const std::vector<uint8_t>& stringBlock, uint32_t offset) {
if (offset >= stringBlock.size()) return false;
// Must be at a string boundary: offset 0 or immediately after a null terminator.
// Without this, small integer field values (e.g. modelId=4) coincidentally
// land in the middle of an existing string and are falsely flagged as strings.
if (offset > 0 && stringBlock[offset - 1] != 0) return false;
// Must be null-terminated within the block and contain only printable/whitespace bytes.
for (size_t i = offset; i < stringBlock.size(); ++i) {
uint8_t c = stringBlock[i];
@ -75,7 +79,9 @@ std::set<uint32_t> detectStringColumns(const DBCFile& dbc,
// If no string block (or trivial size), no string columns.
if (stringBlock.size() <= 1) return stringCols;
for (uint32_t col = 0; col < fieldCount; ++col) {
// Column 0 is always the numeric record ID in WDBC files — never a string,
// even if the uint32 value happens to be a valid string-block offset.
for (uint32_t col = 1; col < fieldCount; ++col) {
bool allZeroOrValid = true;
bool hasNonZero = false;