From 8c24417f8d48d020cd06a6f9ad5244a711b49820 Mon Sep 17 00:00:00 2001 From: goyuken Date: Tue, 9 Oct 2012 01:34:21 +0000 Subject: [PATCH] gamedb stuffed into gamedb subfolder --- BizHawk.Emulation/Database/Database.cs | 11 ++++++----- BizHawk.MultiClient/MainForm.cs | 2 +- BizHawk.MultiClient/output/MakeRelease.bat | 2 +- BizHawk.MultiClient/output/{ => gamedb}/gamedb.txt | 0 .../output/{ => gamedb}/gamedb_a2600.txt | 0 .../output/{ => gamedb}/gamedb_gb.txt | 0 .../output/{ => gamedb}/gamedb_gbc.txt | 0 .../output/{ => gamedb}/gamedb_neshomebrew.txt | 0 .../output/{ => gamedb}/gamedb_pce_cd.txt | 0 .../output/{ => gamedb}/gamedb_pce_hucards.txt | 0 .../output/{ => gamedb}/gamedb_sega_8bit.txt | 0 .../output/{ => gamedb}/gamedb_sega_md.txt | 0 .../output/{ => gamedb}/gamedb_snes.txt | 0 .../output/{ => gamedb}/update_gamedb.bat | 0 BizHawk.MultiClient/output/{ => gamedb}/wget.exe | Bin 15 files changed, 8 insertions(+), 7 deletions(-) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_a2600.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_gb.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_gbc.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_neshomebrew.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_pce_cd.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_pce_hucards.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_sega_8bit.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_sega_md.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/gamedb_snes.txt (100%) rename BizHawk.MultiClient/output/{ => gamedb}/update_gamedb.bat (100%) rename BizHawk.MultiClient/output/{ => gamedb}/wget.exe (100%) diff --git a/BizHawk.Emulation/Database/Database.cs b/BizHawk.Emulation/Database/Database.cs index 47e7c2a14b..ab7c1de7f5 100644 --- a/BizHawk.Emulation/Database/Database.cs +++ b/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); - LoadDatabase(line); + Console.WriteLine("loading external game database {0}", 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; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index d88cda6e57..badf8e2a6e 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/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(); diff --git a/BizHawk.MultiClient/output/MakeRelease.bat b/BizHawk.MultiClient/output/MakeRelease.bat index 9a34ecd5cf..ebb81ba7ab 100644 --- a/BizHawk.MultiClient/output/MakeRelease.bat +++ b/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 \ No newline at end of file +zip -X -9 -r BizHawk.zip BizHawk.MultiClient.exe DiscoHawk.exe *.dll ffmpeg.exe NesCarts.7z gamedb NES\Palettes Lua Gameboy\Palettes \ No newline at end of file diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb/gamedb.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb.txt rename to BizHawk.MultiClient/output/gamedb/gamedb.txt diff --git a/BizHawk.MultiClient/output/gamedb_a2600.txt b/BizHawk.MultiClient/output/gamedb/gamedb_a2600.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_a2600.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_a2600.txt diff --git a/BizHawk.MultiClient/output/gamedb_gb.txt b/BizHawk.MultiClient/output/gamedb/gamedb_gb.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_gb.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_gb.txt diff --git a/BizHawk.MultiClient/output/gamedb_gbc.txt b/BizHawk.MultiClient/output/gamedb/gamedb_gbc.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_gbc.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_gbc.txt diff --git a/BizHawk.MultiClient/output/gamedb_neshomebrew.txt b/BizHawk.MultiClient/output/gamedb/gamedb_neshomebrew.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_neshomebrew.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_neshomebrew.txt diff --git a/BizHawk.MultiClient/output/gamedb_pce_cd.txt b/BizHawk.MultiClient/output/gamedb/gamedb_pce_cd.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_pce_cd.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_pce_cd.txt diff --git a/BizHawk.MultiClient/output/gamedb_pce_hucards.txt b/BizHawk.MultiClient/output/gamedb/gamedb_pce_hucards.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_pce_hucards.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_pce_hucards.txt diff --git a/BizHawk.MultiClient/output/gamedb_sega_8bit.txt b/BizHawk.MultiClient/output/gamedb/gamedb_sega_8bit.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_sega_8bit.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_sega_8bit.txt diff --git a/BizHawk.MultiClient/output/gamedb_sega_md.txt b/BizHawk.MultiClient/output/gamedb/gamedb_sega_md.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_sega_md.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_sega_md.txt diff --git a/BizHawk.MultiClient/output/gamedb_snes.txt b/BizHawk.MultiClient/output/gamedb/gamedb_snes.txt similarity index 100% rename from BizHawk.MultiClient/output/gamedb_snes.txt rename to BizHawk.MultiClient/output/gamedb/gamedb_snes.txt diff --git a/BizHawk.MultiClient/output/update_gamedb.bat b/BizHawk.MultiClient/output/gamedb/update_gamedb.bat similarity index 100% rename from BizHawk.MultiClient/output/update_gamedb.bat rename to BizHawk.MultiClient/output/gamedb/update_gamedb.bat diff --git a/BizHawk.MultiClient/output/wget.exe b/BizHawk.MultiClient/output/gamedb/wget.exe similarity index 100% rename from BizHawk.MultiClient/output/wget.exe rename to BizHawk.MultiClient/output/gamedb/wget.exe