0.73c:

Fixed Import from haks
Cjreek · Feb 9, 2024 · c52c9d8 · c52c9d8
1 parent 5fb4386
commit c52c9d8
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 34 deletions.
diff --git a/eos-edit/Views/MainWindow.axaml b/eos-edit/Views/MainWindow.axaml
@@ -20,7 +20,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Eos.Views.MainWindow" MinHeight="300" MinWidth="500"
         Height="700" Width="1100" Loaded="mainWindow_Loaded"
-        x:Name="mainWindow" Tag="Eos Toolset v0.73b" FontFamily="Segoe UI"
+        x:Name="mainWindow" Tag="Eos Toolset v0.73c" FontFamily="Segoe UI"
         Closing="mainWindow_Closing"
         Icon="/Assets/Icons/Eos.ico">
   <Window.Title>

diff --git a/eos/Config/EosConfig.cs b/eos/Config/EosConfig.cs
@@ -172,7 +172,7 @@ private static String FindNwnBasePath()
             {
                 Log.Info("Found Beamdog settings.json at: {0}", path);
 
-                var fs = new FileStream(settingsFile, FileMode.Open, FileAccess.Read);
+                var fs = new FileStream(settingsFile, FileMode.Open, FileAccess.Read, FileShare.Read);
                 try
                 {
                     if (JsonNode.Parse(fs) is JsonObject settingsRoot)
@@ -275,7 +275,7 @@ public static void Load()
             {
                 try
                 {
-                    var fs = new FileStream(Constants.ConfigPath, FileMode.Open, FileAccess.Read);
+                    var fs = new FileStream(Constants.ConfigPath, FileMode.Open, FileAccess.Read, FileShare.Read);
                     try
                     {
                         if (JsonNode.Parse(fs) is JsonObject configJson)

diff --git a/eos/Nwn/2da/2daFile.cs b/eos/Nwn/2da/2daFile.cs
@@ -456,7 +456,7 @@ public void Load(String filename)
         {
             if (File.Exists(filename))
             {
-                var fs = new FileStream(filename, FileMode.Open, FileAccess.Read);
+                var fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
                 try
                 {
                     Load(fs);

diff --git a/eos/Nwn/Bif/BifFile.cs b/eos/Nwn/Bif/BifFile.cs
@@ -42,7 +42,7 @@ internal class BifFile
 
         public void Load(String bifFile)
         {
-            fileStream = new FileStream(bifFile, FileMode.Open, FileAccess.Read);
+            fileStream = new FileStream(bifFile, FileMode.Open, FileAccess.Read, FileShare.Read);
             reader = new BinaryReader(fileStream);
             header = BinaryHelper.Read<BifHeader>(reader);
         }

diff --git a/eos/Nwn/Bif/KeyFile.cs b/eos/Nwn/Bif/KeyFile.cs
@@ -58,7 +58,7 @@ internal class KeyFile : IEnumerable<(String? resRef, NWNResourceType type)>
 
         public void Load(String filename)
         {
-            FileStream fs = new FileStream(filename, FileMode.Open);
+            FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
             try
             {
                 Load(fs);

diff --git a/eos/Nwn/BinaryHelper.cs b/eos/Nwn/BinaryHelper.cs
@@ -46,6 +46,11 @@ public static void Write<T>(BinaryWriter stream, T? data)
             }
         }
 
+        public static void Skip(BinaryReader stream, int count)
+        {
+            stream.ReadBytes(count);
+        }
+
         public static String ReadString(BinaryReader stream, int length)
         {
             return new String(stream.ReadChars(length)).Trim('\0');

diff --git a/eos/Nwn/Tlk/TlkFile.cs b/eos/Nwn/Tlk/TlkFile.cs
@@ -77,7 +77,7 @@ public void Load(String tlkFile, bool writeable = false)
                 header = BinaryHelper.Read<TlkHeader>(reader);
             };
 
-            fileStream = new FileStream(tlkFile, FileMode.Open, FileAccess.Read);
+            fileStream = new FileStream(tlkFile, FileMode.Open, FileAccess.Read, FileShare.Read);
             reader = new BinaryReader(fileStream, languageEncodings[header.LanguageId]);
             if (writeable)
             {

diff --git a/eos/Repositories/ModelRepository.cs b/eos/Repositories/ModelRepository.cs
@@ -151,7 +151,7 @@ public void LoadFromFile(string filename)
                 {
                     Log.Info("Loading \"{0}\"", filename);
 
-                    var fs = new FileStream(filename, FileMode.Open, FileAccess.Read);
+                    var fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
                     try
                     {
                         if (JsonNode.Parse(fs) is JsonObject jsonRepository)