Skip to content

Fix Reference Data writing in WDC1 / WDC2 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marlamin merged 2 commits into from
Jan 6, 2025
Merged

Fix Reference Data writing in WDC1 / WDC2 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bf78cc
Merge pull request #2 from wowdev/master
KalopsiaTwilight Jan 5, 2025
5419841
Fix wrong interpretation of reference in WDC1&WDC2
KalopsiaTwilight Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions DBCD.IO/Writers/WDC1Writer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,30 @@ public void Serialize(int id, T row)

int fieldIndex = i - indexFieldOffSet;

// relationship field, used for faster lookup on IDs
if (info.IsNonInlineRelation)
// reference data field
if (fieldIndex >= m_writer.Meta.Length)
{
m_writer.ReferenceData.Add((int)Convert.ChangeType(info.Getter(row), typeof(int)));
continue;
}

// relationship field, used for faster lookup on IDs
if (info.IsRelation)
m_writer.ReferenceData.Add((int)Convert.ChangeType(info.Getter(row), typeof(int)));

if (info.IsArray)
{
if (arrayWriters.TryGetValue(info.FieldType, out var writer))
writer(bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], (Array)info.Getter(row));
else
throw new Exception("Unhandled array type: " + typeof(T).Name);
}
else
{
if (info.IsArray)
{
if (arrayWriters.TryGetValue(info.FieldType, out var writer))
writer(bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], (Array)info.Getter(row));
else
throw new Exception("Unhandled array type: " + typeof(T).Name);
}
if (simpleWriters.TryGetValue(info.FieldType, out var writer))
writer(id, bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], info.Getter(row));
else
{
if (simpleWriters.TryGetValue(info.FieldType, out var writer))
writer(id, bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], info.Getter(row));
else
throw new Exception("Unhandled field type: " + typeof(T).Name);
}
throw new Exception("Unhandled field type: " + typeof(T).Name);
}
}

Expand Down
34 changes: 19 additions & 15 deletions DBCD.IO/Writers/WDC2Writer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,31 @@ public void Serialize(int id, T row)

int fieldIndex = i - indexFieldOffSet;

// relationship field, used for faster lookup on IDs
if (info.IsNonInlineRelation)
// reference data field
if (fieldIndex >= m_writer.Meta.Length)
{
m_writer.ReferenceData.Add((int)Convert.ChangeType(info.Getter(row), typeof(int)));
continue;
}

// relationship field, used for faster lookup on IDs
if (info.IsRelation)
m_writer.ReferenceData.Add((int)Convert.ChangeType(info.Getter(row), typeof(int)));


if (info.IsArray)
{
if (arrayWriters.TryGetValue(info.FieldType, out var writer))
writer(bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], (Array)info.Getter(row));
else
throw new Exception("Unhandled array type: " + typeof(T).Name);
}
else
{
if (info.IsArray)
{
if (arrayWriters.TryGetValue(info.FieldType, out var writer))
writer(bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], (Array)info.Getter(row));
else
throw new Exception("Unhandled array type: " + typeof(T).Name);
}
if (simpleWriters.TryGetValue(info.FieldType, out var writer))
writer(id, bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], info.Getter(row));
else
{
if (simpleWriters.TryGetValue(info.FieldType, out var writer))
writer(id, bitWriter, m_writer, m_fieldMeta[fieldIndex], ColumnMeta[fieldIndex], PalletData[fieldIndex], CommonData[fieldIndex], info.Getter(row));
else
throw new Exception("Unhandled field type: " + typeof(T).Name);
}
throw new Exception("Unhandled field type: " + typeof(T).Name);
}
}

Expand Down
Loading