.

Engines/NScumm.Sword1/Logic.Mcode.cs

@@ -17,6 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Diagnostics;
 using NScumm.Core;
 
 namespace NScumm.Sword1
@@ -598,7 +599,8 @@ private int fnChangeSpeechText(SwordObject cpt, int id, int tar, int width, int
         //The game is halted for debugging. Maybe we'll remove this later.
         private int fnTalkError(SwordObject cpt, int id, int c, int d, int e, int f, int z, int x)
         {
-            throw new InvalidOperationException($"fnTalkError for id {id}, instruction {cpt.down_flag}");
+            //throw new InvalidOperationException($"fnTalkError for id {id}, instruction {cpt.down_flag}");
+            Debug.WriteLine("$\"fnTalkError for id {id}, instruction {cpt.down_flag}");
             return SCRIPT_STOP; // for compilers that don't support NORETURN
         }
 
@@ -1065,7 +1067,8 @@ private int fnStopMusic(SwordObject cpt, int id, int a, int b, int c, int d, int
 
         private int fnInnerSpace(SwordObject cpt, int id, int a, int b, int c, int d, int z, int x)
         {
-            throw new InvalidOperationException("fnInnerSpace() not working");
+            //throw new InvalidOperationException("fnInnerSpace() not working");
+            Debug.WriteLine("[ex] fnInnerSpace() not working");
             return SCRIPT_STOP; // for compilers that don't support NORETURN
         }
 

Engines/NScumm.Sword1/Router.cs

@@ -2166,7 +2166,8 @@ private int LoadWalkResources(SwordObject megaObject, int x, int y, int dir)
             if (_nBars >= O_GRID_SIZE)
             {
 #if DEBUG //Check for id > number in file,
-                throw new InvalidOperationException($"RouteFinder Error too many _bars {_nBars}");
+                //throw new InvalidOperationException($"RouteFinder Error too many _bars {_nBars}");
+                Debug.WriteLine($"RouteFinder Error too many _bars {_nBars}");
 #endif
                 _nBars = 0;
             }
@@ -2176,7 +2177,8 @@ private int LoadWalkResources(SwordObject megaObject, int x, int y, int dir)
             if (_nNodes >= O_GRID_SIZE)
             {
 #if DEBUG //Check for id > number in file,
-                throw new InvalidOperationException($"RouteFinder Error too many nodes {_nNodes}");
+                //throw new InvalidOperationException($"RouteFinder Error too many nodes {_nNodes}");
+                Debug.WriteLine($"RouteFinder Error too many nodes {_nNodes}");
 #endif
                 _nNodes = 0;
             }

NScumm.Core/Audio/Mixer.cs

@@ -349,7 +349,7 @@ public SoundTypeSettings(int volume)
                 Volume = volume;
             }
 
-            public bool Mute;
+            public bool Mute = default;
             public readonly int Volume;
         }
     }

NScumm.Core/NScumm.Core.csproj

@@ -11,6 +11,7 @@
     <TargetFrameworkProfile>Profile344</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <LangVersion>11.0</LangVersion>
 	<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

NScumm.MonoGame/Platforms/UWP/NScumm.MonoGame/NScumm.UWP.csproj

@@ -18,8 +18,9 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>NScummUWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>F2B638E02409EFE0AD49AD0D52975B71B0BF48A9</PackageCertificateThumbprint>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <PackageCertificateThumbprint>
+    </PackageCertificateThumbprint>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <AppxBundle>Never</AppxBundle>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
@@ -28,9 +29,9 @@
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
-    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <!--AppxPackageSigningEnabled>True</AppxPackageSigningEnabled-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -145,6 +146,11 @@
     <Content Include="Assets\Square150x150Logo.scale-125.png" />
     <Content Include="Assets\Square150x150Logo.scale-150.png" />
     <Content Include="Assets\Square150x150Logo.scale-400.png" />
+    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
+    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
+    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
+    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
+    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
     <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
     <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
     <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-32.png" />
@@ -300,9 +306,6 @@
     <PackageReference Include="MonoGame.Framework.WindowsUniversal">
       <Version>3.5.0.1678</Version>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
-    </PackageReference>
     <PackageReference Include="NotificationsExtensions.Win10">
       <Version>14332.0.2</Version>
     </PackageReference>
@@ -394,10 +397,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
+       Other similar extension points exist, see Microsoft.Common.targets.-->
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  <!-- -->
 </Project>

NScumm.MonoGame/Platforms/UWP/NScumm.MonoGame/Package.appxmanifest

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" IgnorableNamespaces="uap mp uap2">
   <Identity Name="ME.NSCUMM1" Publisher="CN=Admin" Version="1.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="b1aac8f5-189c-42ba-a130-8c78b81892d9" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
@@ -235,5 +235,11 @@
   </Applications>
   <Capabilities>
     <uap:Capability Name="removableStorage" />
+    <uap:Capability Name="picturesLibrary"/>
+    <uap:Capability Name="musicLibrary"/>
+    <uap2:Capability Name="spatialPerception"/>
+    <Capability Name="internetClient"/>
+    <uap:Capability Name="videosLibrary"/>
+    <DeviceCapability Name="lowLevel"/>
   </Capabilities>
 </Package>

Platforms/NScumm.Platform_UWP/FileStorage.cs

@@ -7,6 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using System;
+using System.Diagnostics;
 
 namespace NScumm
 {
@@ -137,7 +138,7 @@ public string ReadContent(string path, bool localState = false)
                 }
                 catch (Exception ex)
                 {
-
+                    Debug.WriteLine("[ex] FileStorage ex.: "+ ex.Message);
                 }
             }
             else
@@ -155,7 +156,7 @@ public string ReadContent(string path, bool localState = false)
                 }
                 catch (Exception ex)
                 {
-
+                    Debug.WriteLine("[!] " + ex.Message);
                 }
             }
             return fileContent;
@@ -180,7 +181,7 @@ public Stream OpenContent(string path, bool localState = false)
                 }
                 catch (Exception ex)
                 {
-
+                    Debug.WriteLine("[!!] " + ex.Message);
                 }
             }
             var installedLocation = Windows.ApplicationModel.Package.Current.InstalledLocation;

Platforms/NScumm.Platform_UWP/NScumm.Platform_UWP.csproj

@@ -128,9 +128,6 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.8</Version>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
-    </PackageReference>
     <PackageReference Include="System.Xml.XDocument">
       <Version>4.3.0</Version>
     </PackageReference>

README.md

@@ -1,8 +1,6 @@
-# NScummUWP 
+# NScummUWP v1.2
 The SCUMM UWP client for the Windows 10 (Mobile) platform. :)
 
-Download ARM package and LOOM test game (https://github.com/mediaexplorer74/nscumm/releases/tag/1.1.14)
-
 ## my 2 cents
 1. RnD nSCUMM by scemino (https://github.com/scemino/nscumm)
 2. RnD nSCUMMUWP by Bashar Astifan (https://github.com/basharast/NScummUWP)