gamedb stuffed into gamedb subfolder

BizHawk.Emulation/Database/Database.cs

@@ -39,14 +39,15 @@ namespace BizHawk
 			return new GameInfo(cgi);
 		}
 
-		static void LoadDatabase_Escape(string line)
+		static void LoadDatabase_Escape(string line, string path)
 		{
 			if (!line.ToUpper().StartsWith("#INCLUDE")) return;
 			line = line.Substring(8).TrimStart();
-			if (File.Exists(line))
+			string filename = Path.Combine(path, line);
+			if (File.Exists(filename))
 			{
-				Console.WriteLine("loaded external game database {0}", line);
+				Console.WriteLine("loading external game database {0}", line);
-				LoadDatabase(line);
+				LoadDatabase(filename);
 			}
 			else
 				Console.WriteLine("BENIGN: missing external game database {0}", line);
@@ -64,7 +65,7 @@ namespace BizHawk
 						if (line.StartsWith(";")) continue; //comment
 						if (line.StartsWith("#"))
 						{
-							LoadDatabase_Escape(line);
+							LoadDatabase_Escape(line, Path.GetDirectoryName(path));
 							continue;
 						}
 						if (line.Trim().Length == 0) continue;

BizHawk.MultiClient/MainForm.cs

@@ -123,7 +123,7 @@ namespace BizHawk.MultiClient
 			Global.CoreInputComm = new CoreInputComm();
 			SyncCoreInputComm();
 
-			Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb.txt"));
+			Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), @"gamedb\gamedb.txt"));
 
 			SyncPresentationMode();
 

BizHawk.MultiClient/output/MakeRelease.bat

@@ -1,3 +1,3 @@
 del /s BizHawk.zip
 copy ..\..\SlimDx.dll
-zip -X -9 -r BizHawk.zip BizHawk.MultiClient.exe DiscoHawk.exe *.dll ffmpeg.exe NesCarts.7z gamedb.txt gamedb*.txt NES\Palettes Lua Gameboy\Palettes
+zip -X -9 -r BizHawk.zip BizHawk.MultiClient.exe DiscoHawk.exe *.dll ffmpeg.exe NesCarts.7z gamedb NES\Palettes Lua Gameboy\Palettes