autoupdater fixes, cursor fix, consistent directory separators + use of Path.Combine(), wire bugfixes, more loading screens

2015-10-02 21:33:33 +03:00
parent 24f7a1baa5
commit a285b00eb9
51 changed files with 451 additions and 1304 deletions
@@ -232,7 +232,10 @@ namespace Subsurface.Items.Components
                    case "sound":
                        string filePath = ToolBox.GetAttributeString(subElement, "file", "");
                        if (filePath=="") continue;
-                        if (!filePath.Contains("/")) filePath = Path.GetDirectoryName(item.Prefab.ConfigFile)+"/"+filePath;
+                        if (!filePath.Contains("/") && !filePath.Contains("\\") && !filePath.Contains(Path.DirectorySeparatorChar))
+                        {
+                            filePath = Path.Combine(Path.GetDirectoryName(item.Prefab.ConfigFile), filePath);
+                        }

                        ActionType type;