From 797504611eb3da5bd09b50ce2e94b1b23540644d Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 7 Nov 2019 18:17:34 -0500 Subject: [PATCH] Fixes loading of db2 with LocalizedStrings --- Source/Game/DataStorage/ClientReader/DBReader.cs | 4 ++-- Source/Game/DataStorage/Structs/A_Records.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/DataStorage/ClientReader/DBReader.cs b/Source/Game/DataStorage/ClientReader/DBReader.cs index aadb61926..267200530 100644 --- a/Source/Game/DataStorage/ClientReader/DBReader.cs +++ b/Source/Game/DataStorage/ClientReader/DBReader.cs @@ -235,7 +235,7 @@ namespace Game.DataStorage bool hasRef = refData.Entries.TryGetValue(i, out int refId); long recordIndex = i + previousRecordCount; - long recordOffset = (recordIndex * Header.RecordSize) - (Header.RecordCount * Header.RecordSize); + long recordOffset = (recordIndex * Header.RecordSize) - (Header.RecordCount * Header.RecordSize); var rec = new WDC3Row(this, bitReader, (int)recordOffset, Header.HasIndexTable() ? (isIndexEmpty ? i : indexData[i]) : -1, hasRef ? refId : -1, stringsTable); _records.Add(rec.Id, rec); @@ -537,7 +537,7 @@ namespace Game.DataStorage } else { - var pos = _recordsOffset + _data.Offset + (_data.Position >> 3); + var pos = _recordsOffset + (_data.Position >> 3); int ofs = GetFieldValue(fieldIndex); localized[LocaleConstant.enUS] = _stringsTable.LookupByKey(pos + ofs); } diff --git a/Source/Game/DataStorage/Structs/A_Records.cs b/Source/Game/DataStorage/Structs/A_Records.cs index 48fbf6eb4..ece11ce81 100644 --- a/Source/Game/DataStorage/Structs/A_Records.cs +++ b/Source/Game/DataStorage/Structs/A_Records.cs @@ -81,7 +81,7 @@ namespace Game.DataStorage public ushort UwZoneMusic; public byte ExplorationLevel; public ushort IntroSound; - public byte UwIntroSound; + public uint UwIntroSound; public byte FactionGroupMask; public float AmbientMultiplier; public byte MountFlags;