diff --git a/CUE4Parse b/CUE4Parse index 8c8eb235..f90db397 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 8c8eb2358e0d9c1b9dd9dfeed93d72ded87fce35 +Subproject commit f90db3974debc3cd1253fd03c91d01a2ef1be72c diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index caf7527a..34874f13 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -1237,7 +1237,7 @@ public class CUE4ParseViewModel : ViewModel { if (!TabControl.CanAddTabs) return false; - TabControl.AddTab($"{verseDigest.ProjectName}.verse"); + TabControl.AddTab($"{verseDigest.Name}.verse"); TabControl.SelectedTab.Highlighter = AvalonExtensions.HighlighterSelector("verse"); TabControl.SelectedTab.SetDocumentText(verseDigest.ReadableCode, false, false); return true; @@ -1621,7 +1621,7 @@ public class CUE4ParseViewModel : ViewModel if (dummy is not UClass || pointer.Object.Value is not UClass blueprint) continue; - cppList.Add(blueprint.DecompileBlueprintToPseudo(pkg.Mappings, cookedMetaData)); + cppList.Add(blueprint.DecompileBlueprintToPseudo(cookedMetaData)); } if (cppList.Count == 0) return false; diff --git a/FModel/Views/SettingsView.xaml.cs b/FModel/Views/SettingsView.xaml.cs index 7a4f8bf1..a076f3be 100644 --- a/FModel/Views/SettingsView.xaml.cs +++ b/FModel/Views/SettingsView.xaml.cs @@ -121,7 +121,7 @@ public partial class SettingsView { Title = "Select a mapping file", InitialDirectory = Path.Combine(UserSettings.Default.OutputDirectory, ".data"), - Filter = "USMAP Files (*.usmap)|*.usmap|All Files (*.*)|*.*" + Filter = "USMAP Files (*.usmap, *.jmap, *.jmap.gz)|*.usmap;*.jmap;*.jmap.gz|All Files (*.*)|*.*" }; if (!openFileDialog.ShowDialog().GetValueOrDefault())