Fixed several crashes

MontagueM · Aug 27, 2022 · a6093db · a6093db
1 parent 7e4cc1b
commit a6093db
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/Charm/ExportControl.xaml.cs b/Charm/ExportControl.xaml.cs
@@ -19,7 +19,7 @@ public enum EExportTypeFlag
     [Description("Terrain only")]
     TerrainOnly = 4,
     [Description("Pre-arranged map")]
-    ArrangedMap = 8,
+    ArrangedMap = 8,    
 }
 
 public partial class ExportControl : UserControl

diff --git a/Charm/MainWindow.xaml.cs b/Charm/MainWindow.xaml.cs
@@ -95,7 +95,7 @@ private void CheckGameVersion()
 
     private async void CheckVersion()
     {
-        var currentVersion = new ApplicationVersion("1.2.1");
+        var currentVersion = new ApplicationVersion("1.2.2");
         var versionChecker = new ApplicationVersionChecker("https://github.com/MontagueM/Charm/raw/main/", currentVersion);
         versionChecker.LatestVersionName = "version";
         try

diff --git a/Charm/MapView.xaml.cs b/Charm/MapView.xaml.cs
@@ -48,7 +48,8 @@ public void LoadMap(TagHash tagHash, ELOD detailLevel)
 
     private void GetStaticMapData(TagHash tagHash, ELOD detailLevel)
     {
-        StaticMapData staticMapData = PackageHandler.GetTag(typeof(StaticMapData), tagHash);
+        Tag<D2Class_07878080> tag = PackageHandler.GetTag<D2Class_07878080>(tagHash);
+        StaticMapData staticMapData = ((D2Class_C96C8080)tag.Header.DataTables[1].DataTable.Header.DataEntries[0].DataResource).StaticMapParent.Header.StaticMap;
         SetMapUI(staticMapData, detailLevel);
     }
 

diff --git a/Charm/MusicView.xaml.cs b/Charm/MusicView.xaml.cs
@@ -45,8 +45,11 @@ public async void Load(TagHash tagHash)
             var res = (D2Class_F7458080) resource;
             WemsControl.Load(res);
             EventsControl.Load(res);
-            var sbhash = res.AmbientMusicSet.Header.Unk08[0].MusicLoopSound.Header.Unk18.Header.SoundBank.Hash;
-            SoundbankHash.Text = $"Soundbank: {sbhash} / {sbhash.GetPkgId().ToString("X4")}-{sbhash.GetEntryIndex().ToString("X4")}";
+            if (res.AmbientMusicSet != null)
+            {
+                var sbhash = res.AmbientMusicSet.Header.Unk08[0].MusicLoopSound.Header.Unk18.Header.SoundBank.Hash;
+                SoundbankHash.Text = $"Soundbank: {sbhash} / {sbhash.GetPkgId().ToString("X4")}-{sbhash.GetEntryIndex().ToString("X4")}";
+            }
         }
         else
         {

diff --git a/Charm/MusicWemsControl.xaml.cs b/Charm/MusicWemsControl.xaml.cs
@@ -59,6 +59,8 @@ public void Load(D2Class_F5458080 res)
 
     public async void Load(D2Class_F7458080 res)
     {
+        if (res.AmbientMusicSet == null)
+            return;
         // ambient_music_set instead of wwise_loop
         MainWindow.Progress.SetProgressStages(res.AmbientMusicSet.Header.Unk08.Select((x,i) => $"Loading ambient music {i+1}/{res.AmbientMusicSet.Header.Unk08.Count}").ToList());
 

diff --git a/Field/General/Activity.cs b/Field/General/Activity.cs
@@ -428,14 +428,15 @@ public struct D2Class_318A8080
     public int Unk28;
 }
 
-[StructLayout(LayoutKind.Sequential, Size = 0x18)]
+[StructLayout(LayoutKind.Sequential, Size = 0x20)]
 public struct D2Class_FA458080
 {
     public DestinyHash Unk00;
     [DestinyOffset(8), DestinyField(FieldType.RelativePointer)]
     public string EventName;
 
     public DestinyHash Unk10;  // eventhash? idk
+    public DestinyHash Unk14;
 }
 
 [StructLayout(LayoutKind.Sequential, Size = 0x20)]

diff --git a/version.xml b/version.xml
@@ -1,3 +1,3 @@
 <Version>
-  <Id>1.2.1</Id>
+  <Id>1.2.2</Id>
 </Version>