.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Media Explorer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

NScummUWP.sln

@@ -4,20 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.6.33513.286
 MinimumVisualStudioVersion = 10.0.40219.1
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.UWP", "NScumm.UWP\NScumm.UWP.csproj", "{74ED9AF5-716F-48A7-97A5-FCDB51C6F950}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.UWP", "Src\NScumm.UWP\NScumm.UWP.csproj", "{74ED9AF5-716F-48A7-97A5-FCDB51C6F950}"
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Core", "NScumm.Core\NScumm.Core.csproj", "{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Core", "Src\NScumm.Core\NScumm.Core.csproj", "{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}"
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Platform_UWP", "NScumm.Platform_UWP\NScumm.Platform_UWP.csproj", "{F8002A61-23CF-4B47-9561-830F18AFF6F1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Platform_UWP", "Src\NScumm.Platform_UWP\NScumm.Platform_UWP.csproj", "{F8002A61-23CF-4B47-9561-830F18AFF6F1}"
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Scumm", "NScumm.Scumm\NScumm.Scumm.csproj", "{97342112-448A-4636-827F-8D47B226D86F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Scumm", "Src\NScumm.Scumm\NScumm.Scumm.csproj", "{97342112-448A-4636-827F-8D47B226D86F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sky", "NScumm.Sky\NScumm.Sky.csproj", "{8740A0CD-2613-4354-9506-35035A735962}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sky", "Src\NScumm.Sky\NScumm.Sky.csproj", "{8740A0CD-2613-4354-9506-35035A735962}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sword1", "NScumm.Sword1\NScumm.Sword1.csproj", "{EF539A3F-0672-412C-B9D0-38DCD3622D99}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sword1", "Src\NScumm.Sword1\NScumm.Sword1.csproj", "{EF539A3F-0672-412C-B9D0-38DCD3622D99}"
 EndProject
 
 Global

README.md

@@ -1,15 +1,17 @@
-# NScummUWP v1.2.1
+# NScummUWP v1.2.2
 The SCUMM UWP client for the Windows 10 (Mobile) platform. :)
 
 ## my 2 cents
 1. RnD nSCUMM by Scemino (https://github.com/scemino/nscumm)
 2. RnD nSCUMMUWP by Bashar Astifan (https://github.com/basharast/NScummUWP) 
 3. nSCUMM "refubrishing" (SceminoNSCUMM+NSCUMMUWP synthez...)
 4. Some "project optimization" applied (reducing srccode's filesize from 166mb to 32mb)
+5. ru_RU local. added
 
 ## Screenshots / Images
-![screenshot](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot1.png)
-![demo reel](https://github.com/mediaexplorer74/nscumm/blob/master/Images/nscumm.png)
+![W10 Desktop](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot1.png)
+![W10M 15252 on L950](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot2.png)
+![W10M Astoria on L640DS](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot3.png)
 
 ## Build instructions
 1. First, check that you have the [necessary tools](#requirements) installed.

NScumm.Core/Video/AudioTrack.cs → Src/NScumm.Core/Video/AudioTrack.cs

@@ -2,19 +2,7 @@
 //       scemino <[email protected]>
 //
 //  Copyright (c) 2015 
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 using System;
 using NScumm.Core.Audio;
@@ -119,11 +107,14 @@ public void Start()
                 Mixer.PauseHandle(_handle, true);
         }
 
-        // TODO:
+        // TODO / FIXIT / RnD
         public void Start(Timestamp limit)
         {
             Stop();
-            throw new NotImplementedException();
+
+            // ?
+            //throw new NotImplementedException();
+
             var stream = AudioStream;
             if (stream == null) throw new InvalidOperationException("stream should not be null");
 

NScumm.Core/Video/BigHuffmanTree.cs → Src/NScumm.Core/Video/BigHuffmanTree.cs

@@ -1,20 +1,10 @@
+// BigHuffmanTree.cs
+//
 //  Author:
 //       scemino <[email protected]>
 //
 //  Copyright (c) 2015 
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 using System;
 using System.Diagnostics;
@@ -121,7 +111,9 @@ private uint DecodeTree(uint prefix, int length)
 
             _tree[t] = SMK_NODE | r1;
 
+#pragma warning disable CS0675 // Áèòîâàÿ îïåðàöèÿ èëè îïåðàòîð, èñïîëüçîâàâøèéñÿ â îïåðàíäå ñ ðàñøèðåíèåì çíàêà
             uint r2 = DecodeTree((uint)(prefix | (1 << length)), length + 1);
+#pragma warning restore CS0675 // Áèòîâàÿ îïåðàöèÿ èëè îïåðàòîð, èñïîëüçîâàâøèéñÿ â îïåðàíäå ñ ðàñøèðåíèåì çíàêà
             return r1 + r2 + 1;
         }
 
@@ -150,7 +142,6 @@ public uint GetCode(BitStream bs)
                 _tree[_last[1]] = _tree[_last[0]];
                 _tree[_last[0]] = v;
             }
-
             return v;
         }
     }

NScumm.Core/Video/VideoDecoder.cs → Src/NScumm.Core/Video/VideoDecoder.cs

@@ -1,20 +1,10 @@
+// VideoDecoder.cs
+//
 //  Author:
 //       scemino <[email protected]>
 //
 //  Copyright (c) 2015 
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 using System;
 using System.Collections.Generic;

NScumm.Platform_UWP/FileStorage.cs → Src/NScumm.Platform_UWP/FileStorage.cs

@@ -1,4 +1,6 @@
-using NScumm.Core;
+// FileStorage.cs
+
+using NScumm.Core;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

NScumm.Scumm/IO/GameManager.cs → Src/NScumm.Scumm/IO/GameManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -53,8 +54,9 @@ public GameInfo GetInfo(string path)
                     }
                     catch (Exception ex)
                     {
-
+                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                     }
+
                     var features = ParseFeatures((string)attFeatures);
                     var attMusic = game.Attribute("music");
                     var music = ParseMusic((string)attMusic);
@@ -66,8 +68,9 @@ public GameInfo GetInfo(string path)
                     }
                     catch (Exception ex)
                     {
-
+                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                     }
+
                     info = new GameInfo
                     {
                         MD5 = signature,
@@ -85,7 +88,7 @@ public GameInfo GetInfo(string path)
                 }
                 catch (Exception ex)
                 {
-
+                    Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                 }
             }
 
@@ -100,7 +103,7 @@ public GameInfo GetInfo(string path)
                     }
                     catch (Exception ex)
                     {
-
+                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                     }
                     LanguagesListReady = true;
                 }
@@ -130,7 +133,7 @@ public GameInfo GetInfo(string path)
                         }
                         catch (Exception ex)
                         {
-
+                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                         }
                         var gameId = "";
                         var gameVariant = "";
@@ -152,7 +155,7 @@ public GameInfo GetInfo(string path)
                         }
                         catch (Exception ex)
                         {
-
+                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                         }
 
                         try
@@ -171,14 +174,14 @@ public GameInfo GetInfo(string path)
                                     }
                                     catch (Exception ex)
                                     {
-
+                                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                                     }
                                 }
                             }
                         }
                         catch (Exception ex)
                         {
-
+                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                         }
 
                         try
@@ -199,7 +202,7 @@ public GameInfo GetInfo(string path)
                                     }
                                     catch (Exception ex)
                                     {
-
+                                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                                     }
                                 }
                             }
@@ -221,14 +224,14 @@ public GameInfo GetInfo(string path)
                                     }
                                     catch (Exception ex)
                                     {
-
+                                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                                     }
                                 }
                             }
                         }
                         catch (Exception ex)
                         {
-
+                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                         }
 
                         try
@@ -245,13 +248,13 @@ public GameInfo GetInfo(string path)
                                 }
                                 catch (Exception ex)
                                 {
-
+                                    Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                                 }
                             }
                         }
                         catch (Exception ex)
                         {
-
+                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                         }
 
                         try
@@ -273,7 +276,7 @@ public GameInfo GetInfo(string path)
                                 }
                                 catch (Exception ex)
                                 {
-
+                                    Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                                 }
                             }
 
@@ -294,6 +297,8 @@ public GameInfo GetInfo(string path)
                                         }
                                         catch (Exception ex)
                                         {
+                                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
+
                                             tempVariant = gameCodeData[1];
                                         }
                                     }
@@ -309,14 +314,15 @@ public GameInfo GetInfo(string path)
                                     }
                                     catch (Exception ex)
                                     {
+                                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                                         gameVariant = tempVariant;
                                     }
                                 }
                             }
                         }
                         catch (Exception ex)
                         {
-
+                            Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                         }
                         info = new GameInfo
                         {
@@ -353,13 +359,13 @@ GameFeatures ParseFeatures(string feature)
                     }
                     catch (Exception ex)
                     {
-
+                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                     }
                 }
             }
             catch (Exception ex)
             {
-
+                Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
             }
             return features;
         }
@@ -379,13 +385,13 @@ MusicDriverTypes ParseMusic(string music)
                     }
                     catch (Exception ex)
                     {
-
+                        Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
                     }
                 }
             }
             catch (Exception ex)
             {
-
+                Debug.WriteLine("[ex] (GameManager) : " + ex.Message);
             }
             return musics;
         }