Fix sln file. Fix character map SO bug.

loodakrawa · Mar 25, 2017 · 57914c7 · 57914c7
1 parent 4d5b6d2
commit 57914c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/SpriterDotNet.MonoGame.Windows.sln b/SpriterDotNet.MonoGame.Windows.sln
@@ -34,15 +34,19 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Debug|Any CPU.Build.0 = Debug|x86
 		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Debug|x86.ActiveCfg = Debug|x86
 		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Debug|x86.Build.0 = Debug|x86
 		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Release|Any CPU.ActiveCfg = Release|x86
+		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Release|Any CPU.Build.0 = Release|x86
 		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Release|x86.ActiveCfg = Release|x86
 		{9EA4C831-7243-402E-A0AA-A502E6E1549E}.Release|x86.Build.0 = Release|x86
 		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Debug|Any CPU.Build.0 = Debug|x86
 		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Debug|x86.ActiveCfg = Debug|x86
 		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Debug|x86.Build.0 = Debug|x86
 		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Release|Any CPU.ActiveCfg = Release|x86
+		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Release|Any CPU.Build.0 = Release|x86
 		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Release|x86.ActiveCfg = Release|x86
 		{1A98EB52-3FB5-4B0F-9745-E1E488A869E0}.Release|x86.Build.0 = Release|x86
 		{10C1ED31-6945-4617-85AD-D2575550149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/SpriterDotNet/Providers/DefaultAssetProvider.cs b/SpriterDotNet/Providers/DefaultAssetProvider.cs
@@ -38,6 +38,7 @@ public virtual T Get(int folderId, int fileId)
             if (CharMapValues.ContainsKey(asset))
             {
                 KeyValuePair<int, int> mapping = CharMapValues[asset];
+                if (mapping.Key == folderId && mapping.Value == fileId) return asset;
                 return Get(mapping.Key, mapping.Value);
             }