rework object viewer to have a tab for each section of ILocoObject

OpenLoco · Nov 8, 2023 · 92942b1 · 92942b1
1 parent 2580f6b
commit 92942b1
Show file tree

Hide file tree

Showing 9 changed files with 622 additions and 163 deletions.
diff --git a/OpenLocoTool/DatFileParsing/SawyerStreamReader.cs b/OpenLocoTool/DatFileParsing/SawyerStreamReader.cs
@@ -121,6 +121,10 @@ public ILocoObject LoadFull(string filename, bool loadExtra = true)
 
 			for (var i = 0; i < stringTableAttr.Count; ++i)
 			{
+				var stringName = stringTableAttr.Names[i];
+				stringTable.Add(stringName, new());
+				var languageDict = stringTable[stringName];
+
 				for (; ptr < data.Length && data[ptr] != 0xFF;)
 				{
 					var lang = (LanguageId)data[ptr++];
@@ -129,15 +133,14 @@ public ILocoObject LoadFull(string filename, bool loadExtra = true)
 					while (data[ptr++] != '\0') ;
 
 					var str = Encoding.ASCII.GetString(data[ini..(ptr - 1)]); // do -1 to exclude the \0
-					var stringName = stringTableAttr.Names[i];
-					if (stringTable.ContainsKey((stringName, lang)))
+					if (languageDict.ContainsKey(lang))
 					{
 						//Logger.Error($"Key {(i, lang)} already exists (this shouldn't happen)");
 						break;
 					}
 					else
 					{
-						stringTable.Add((stringName, lang), str);
+						languageDict.Add(lang, str);
 					}
 				}
 

diff --git a/OpenLocoTool/DatFileParsing/Typedefs.cs b/OpenLocoTool/DatFileParsing/Typedefs.cs
@@ -9,7 +9,7 @@
 global using Speed32 = System.Int32;
 global using MicroZ = System.Byte;
 global using SoundObjectId = System.Byte;
-global using StringTable = System.Collections.Generic.Dictionary<(string, OpenLocoTool.LanguageId), string>;
+global using StringTable = System.Collections.Generic.Dictionary<string, System.Collections.Generic.Dictionary<OpenLocoTool.LanguageId, string>>;
 using System.ComponentModel;
 
 namespace OpenLocoTool.DatFileParsing