From 2f65546e865d72803b0123b1c41b2eafa130571e Mon Sep 17 00:00:00 2001 From: PNWParksFan Date: Sun, 8 Sep 2019 22:47:47 -0700 Subject: [PATCH 1/2] Worked on scenario import --- CodeWalker.Core/World/Scenarios.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CodeWalker.Core/World/Scenarios.cs b/CodeWalker.Core/World/Scenarios.cs index 86be53b..dafe1fa 100644 --- a/CodeWalker.Core/World/Scenarios.cs +++ b/CodeWalker.Core/World/Scenarios.cs @@ -1692,7 +1692,16 @@ namespace CodeWalker.World { if (VehicleModelSets == null) return null; AmbientModelSet ms; - VehicleModelSets.TryGetValue(hash, out ms); + if(!VehicleModelSets.TryGetValue(hash, out ms)) + { + string s_hash = hash.ToString("X"); + ms = new AmbientModelSet(); + ms.Name = $"UNKNOWN VEHICLE MODELSET ({s_hash})"; + ms.NameLower = ms.Name.ToLowerInvariant(); + ms.NameHash = new MetaHash(hash); + ms.Models = new AmbientModel[] {}; + VehicleModelSets.Add(hash, ms); + } return ms; } } From 31422c44159d1129b2cde2a746ee350eaf7a471a Mon Sep 17 00:00:00 2001 From: PNWParksFan Date: Sun, 8 Sep 2019 22:58:58 -0700 Subject: [PATCH 2/2] added ped modelset fix --- CodeWalker.Core/World/Scenarios.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CodeWalker.Core/World/Scenarios.cs b/CodeWalker.Core/World/Scenarios.cs index f0e04e9..d598b49 100644 --- a/CodeWalker.Core/World/Scenarios.cs +++ b/CodeWalker.Core/World/Scenarios.cs @@ -1682,7 +1682,16 @@ namespace CodeWalker.World { if (PedModelSets == null) return null; AmbientModelSet ms; - PedModelSets.TryGetValue(hash, out ms); + if(!PedModelSets.TryGetValue(hash, out ms)) + { + string s_hash = hash.ToString("X"); + ms = new AmbientModelSet(); + ms.Name = $"UNKNOWN PED MODELSET ({s_hash})"; + ms.NameLower = ms.Name.ToLowerInvariant(); + ms.NameHash = new MetaHash(hash); + ms.Models = new AmbientModel[] { }; + PedModelSets.Add(hash, ms); + } return ms; } }