ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename GetExePathAbsolute to GetExeDirectoryAbsolute so it doesnt confuse me

This commit is contained in:
zeromus 2011-06-20 09:08:04 +00:00
parent dc7f00b862
commit ca628e6278
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BizHawk.MultiClient/config/PathManager.cs
View File

@ -9,9 +9,9 @@ namespace BizHawk.MultiClient
{ {
public static class PathManager public static class PathManager
{ {
public static string GetExePathAbsolute() public static string GetExeDirectoryAbsolute()
{ {
string p = Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase); string p = Path.GetDirectoryName(Assembly.GetEntryAssembly().GetName().CodeBase);
if (p.Substring(0, 6) == "file:\\") if (p.Substring(0, 6) == "file:\\")
p = p.Remove(0, 6); p = p.Remove(0, 6);
string z = p; string z = p;
@ -35,35 +35,35 @@ namespace BizHawk.MultiClient
public static string GetBasePathAbsolute() public static string GetBasePathAbsolute()
{ {
if (Global.Config.BasePath.Length < 1) //If empty, then EXE path if (Global.Config.BasePath.Length < 1) //If empty, then EXE path
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
if (Global.Config.BasePath.Length >= 5 && if (Global.Config.BasePath.Length >= 5 &&
Global.Config.BasePath.Substring(0, 5) == "%exe%") Global.Config.BasePath.Substring(0, 5) == "%exe%")
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
if (Global.Config.BasePath[0] == '.') if (Global.Config.BasePath[0] == '.')
{ {
if (Global.Config.BasePath.Length == 1) if (Global.Config.BasePath.Length == 1)
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
else else
{ {
if (Global.Config.BasePath.Length == 2 && if (Global.Config.BasePath.Length == 2 &&
Global.Config.BasePath == ".\\") Global.Config.BasePath == ".\\")
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
else else
{ {
string tmp = Global.Config.BasePath; string tmp = Global.Config.BasePath;
tmp = tmp.Remove(0, 1); tmp = tmp.Remove(0, 1);
tmp = tmp.Insert(0, GetExePathAbsolute()); tmp = tmp.Insert(0, GetExeDirectoryAbsolute());
return tmp; return tmp;
} }
} }
} }
if (Global.Config.BasePath.Substring(0, 2) == "..") if (Global.Config.BasePath.Substring(0, 2) == "..")
return RemoveParents(Global.Config.BasePath, GetExePathAbsolute()); return RemoveParents(Global.Config.BasePath, GetExeDirectoryAbsolute());
//In case of error, return EXE path //In case of error, return EXE path
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
} }
public static string GetPlatformBase(string system) public static string GetPlatformBase(string system)
@ -107,11 +107,11 @@ namespace BizHawk.MultiClient
if (path.Length >= 5 && path.Substring(0, 5) == "%exe%") if (path.Length >= 5 && path.Substring(0, 5) == "%exe%")
{ {
if (path.Length == 5) if (path.Length == 5)
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
else else
{ {
string tmp = path.Remove(0, 5); string tmp = path.Remove(0, 5);
tmp = tmp.Insert(0, GetExePathAbsolute()); tmp = tmp.Insert(0, GetExeDirectoryAbsolute());
return tmp; return tmp;
} }
} }
@ -151,12 +151,12 @@ namespace BizHawk.MultiClient
if (path.Length >= 6 && path.Substring(0, 6) == "file:\\") if (path.Length >= 6 && path.Substring(0, 6) == "file:\\")
return path; return path;
else else
return GetExePathAbsolute(); //bad path return GetExeDirectoryAbsolute(); //bad path
} }
} }
//all pad paths default to EXE //all pad paths default to EXE
return GetExePathAbsolute(); return GetExeDirectoryAbsolute();
} }
public static string RemoveParents(string path, string workingpath) public static string RemoveParents(string path, string workingpath)