mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-17 01:23:51 +00:00
Fix DBC loading and bank drag-and-drop reliability
- Force binary loading for SkillLine.dbc (CSV exports are garbled) - Handle quoted numeric values in DBC CSV parser - Fix bank slot drag-and-drop to use mouse-release detection instead of click detection, preventing item drops on wrong slots - Fix action bar item drop to use hoveredOnRelease for consistency
This commit is contained in:
parent
5cb469e318
commit
25412ff5cc
3 changed files with 47 additions and 25 deletions
|
|
@ -251,20 +251,21 @@ std::shared_ptr<DBCFile> AssetManager::loadDBC(const std::string& name) {
|
|||
|
||||
std::vector<uint8_t> dbcData;
|
||||
|
||||
// Some visual DBC CSV exports are known to be malformed in community datasets
|
||||
// Some DBC CSV exports are known to be malformed in community datasets
|
||||
// (string columns shifted, missing numeric ID field). Force binary MPQ data for
|
||||
// these tables to keep model/texture mappings correct.
|
||||
const bool forceBinaryForVisualDbc =
|
||||
// these tables to keep mappings correct.
|
||||
const bool forceBinaryDbc =
|
||||
(name == "CreatureDisplayInfo.dbc" ||
|
||||
name == "CreatureDisplayInfoExtra.dbc" ||
|
||||
name == "ItemDisplayInfo.dbc" ||
|
||||
name == "CreatureModelData.dbc" ||
|
||||
name == "GroundEffectTexture.dbc" ||
|
||||
name == "GroundEffectDoodad.dbc");
|
||||
name == "GroundEffectDoodad.dbc" ||
|
||||
name == "SkillLine.dbc");
|
||||
|
||||
// Try expansion-specific CSV first (e.g. Data/expansions/wotlk/db/Spell.csv)
|
||||
bool loadedFromCSV = false;
|
||||
if (!forceBinaryForVisualDbc && !expansionDataPath_.empty()) {
|
||||
if (!forceBinaryDbc && !expansionDataPath_.empty()) {
|
||||
// Derive CSV name from DBC name: "Spell.dbc" -> "Spell.csv"
|
||||
std::string baseName = name;
|
||||
auto dot = baseName.rfind('.');
|
||||
|
|
@ -286,7 +287,7 @@ std::shared_ptr<DBCFile> AssetManager::loadDBC(const std::string& name) {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (forceBinaryForVisualDbc && !expansionDataPath_.empty()) {
|
||||
if (forceBinaryDbc && !expansionDataPath_.empty()) {
|
||||
LOG_INFO("Skipping CSV override for visual DBC, using binary: ", name);
|
||||
}
|
||||
|
||||
|
|
@ -296,10 +297,10 @@ std::shared_ptr<DBCFile> AssetManager::loadDBC(const std::string& name) {
|
|||
dbcData = readFile(dbcPath);
|
||||
}
|
||||
|
||||
// If binary DBC not found and we skipped CSV earlier (forceBinaryForVisualDbc),
|
||||
// If binary DBC not found and we skipped CSV earlier (forceBinaryDbc),
|
||||
// try CSV as a last resort — better than no data at all (e.g. Classic expansion
|
||||
// where binary DBCs come from MPQ extraction the user may not have done).
|
||||
if (dbcData.empty() && forceBinaryForVisualDbc && !expansionDataPath_.empty()) {
|
||||
if (dbcData.empty() && forceBinaryDbc && !expansionDataPath_.empty()) {
|
||||
std::string baseName = name;
|
||||
auto dot = baseName.rfind('.');
|
||||
if (dot != std::string::npos) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue