Added filesystems, fixed game data loading

Pyrdacor · May 13, 2022 · a675a80 · a675a80
1 parent 42668ef
commit a675a80
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/Ambermoon.Data.Legacy/GameData.cs b/Ambermoon.Data.Legacy/GameData.cs
@@ -334,7 +334,13 @@ void HandleFileNotFound(string file, char disk)
                     return;
 
                 if (stopAtFirstError)
+                {
+                    if (versionPreference != VersionPreference.Post114 &&
+                        Legacy.Files.New114Files.ContainsKey(file))
+                        return;
+
                     throw new FileNotFoundException($"Unable to find file '{file}'.");
+                }
             }
 
             foreach (var ambermoonFile in ambermoonFiles)

diff --git a/Ambermoon.net.sln b/Ambermoon.net.sln
@@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AmbermoonAndroid", "Ambermo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ambermoon.Audio.Android", "Ambermoon.Audio.Android\Ambermoon.Audio.Android.csproj", "{AA5390B0-EBFF-42F0-9793-72C4B5596661}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ambermoon.Data.FileSystems", "Ambermoon.Data.FileSystems\Ambermoon.Data.FileSystems.csproj", "{46185D6F-7AC2-4BAA-802D-E704C27955B3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -374,6 +376,36 @@ Global
 		{AA5390B0-EBFF-42F0-9793-72C4B5596661}.ReleaseWithAndroid|Any CPU.ActiveCfg = ReleaseWithAndroid|Any CPU
 		{AA5390B0-EBFF-42F0-9793-72C4B5596661}.ReleaseWithAndroid|x64.ActiveCfg = ReleaseWithAndroid|Any CPU
 		{AA5390B0-EBFF-42F0-9793-72C4B5596661}.ReleaseWithAndroid|x86.ActiveCfg = ReleaseWithAndroid|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Debug|x64.Build.0 = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Debug|x86.Build.0 = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.DebugAndroid|Any CPU.ActiveCfg = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.DebugAndroid|Any CPU.Build.0 = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.DebugAndroid|x64.ActiveCfg = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.DebugAndroid|x64.Build.0 = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.DebugAndroid|x86.ActiveCfg = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.DebugAndroid|x86.Build.0 = Debug|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Release|x64.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Release|x64.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Release|x86.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.Release|x86.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseNative|Any CPU.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseNative|Any CPU.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseNative|x64.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseNative|x64.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseNative|x86.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseNative|x86.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseWithAndroid|Any CPU.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseWithAndroid|Any CPU.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseWithAndroid|x64.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseWithAndroid|x64.Build.0 = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseWithAndroid|x86.ActiveCfg = Release|Any CPU
+		{46185D6F-7AC2-4BAA-802D-E704C27955B3}.ReleaseWithAndroid|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/nuget.ps1 b/nuget.ps1
@@ -6,4 +6,5 @@ if ($isWindows) {
   xcopy /Y /I "Ambermoon.Common\bin\Release\*.nupkg" "nuget\*"
   xcopy /Y /I "Ambermoon.Data.Legacy\bin\Release\*.nupkg" "nuget\*"
   xcopy /Y /I "Ambermoon.Data.Common\bin\Release\*.nupkg" "nuget\*"
+  xcopy /Y /I "Ambermoon.Data.FileSystems\bin\Release\*.nupkg" "nuget\*"
 }