From 8615df6e129673d4c07ad36902b49e26ac9054f3 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Mon, 10 Feb 2020 10:46:58 +0900
Subject: [PATCH] Add -game option

This overrides the title detection by CRC. For example,

  system3 -game rance41

forces system3 to work in Rance 4.1 mode. See nact_crc32.cpp for
possible flag values. This is useful when running patched games.
---
 src/sdlmain.cpp        |  13 ++--
 src/sys/nact.cpp       |   6 +-
 src/sys/nact.h         |   6 +-
 src/sys/nact_crc32.cpp | 170 +++++++++++++++--------------------------
 4 files changed, 75 insertions(+), 120 deletions(-)

diff --git a/src/sdlmain.cpp b/src/sdlmain.cpp
index 4f04f31..1419564 100644
--- a/src/sdlmain.cpp
+++ b/src/sdlmain.cpp
@@ -35,7 +35,8 @@ int main(int argc, char *argv[])
 #endif
 	g_window = SDL_CreateWindow(buf, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 400, flags);
 
-	const char *fontfile = DEFAULT_FONT_PATH "MTLc3m.ttf";
+	const char* font_file = DEFAULT_FONT_PATH "MTLc3m.ttf";
+	const char* game_id = NULL;
 
 	for (int i = 1; i < argc; i++) {
 		if (strcmp(argv[i], "-gamedir") == 0)
@@ -45,14 +46,16 @@ int main(int argc, char *argv[])
 		else if (strcmp(argv[i], "-savedir") == 0)
 			FILEIO::SetSaveDir(argv[++i]);
 		else if (strcmp(argv[i], "-fontfile") == 0)
-			fontfile = argv[++i];
+			font_file = argv[++i];
+		else if (strcmp(argv[i], "-game") == 0)
+			game_id = argv[++i];
 	}
 
 	// system3 �期化
-	NACT* nact = new NACT(fontfile);
+	NACT* nact = new NACT(game_id, font_file);
 
-	_TCHAR title[128];
-	if(nact->get_title(title, 128)) {
+	const _TCHAR* title = nact->get_title();
+	if (title) {
 #if defined(_SYSTEM1)
 		_stprintf_s(buf, 128, _T("Scenario Decoder SYSTEM1: %s"), title);
 #elif defined(_SYSTEM2)
diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index 8ec4804..e28492a 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -16,7 +16,7 @@ extern SDL_Window* g_window;
 
 // �‰Šú‰»
 
-NACT::NACT(const char* fontfile)
+NACT::NACT(const char* game_id, const char* font_file)
 {
 	mouse_x = mouse_y = 0;
 
@@ -25,7 +25,7 @@ NACT::NACT(const char* fontfile)
 
 	// SYSTEM3 �‰Šú‰»
 
-	crc32 = calc_crc32();
+	crc32 = calc_crc32(game_id);
 	fatal_error = post_quit = false;
 
 	// AG00.DAT“Ç‚Ý�ž‚Ý
@@ -113,7 +113,7 @@ NACT::NACT(const char* fontfile)
 #endif
 
 	// ŠeŽíƒNƒ‰ƒX�¶�¬
-	ags = new AGS(this, fontfile);
+	ags = new AGS(this, font_file);
 	mako = new MAKO(this);
 
 #ifdef USE_JOY
diff --git a/src/sys/nact.h b/src/sys/nact.h
index cf22e61..769dc89 100644
--- a/src/sys/nact.h
+++ b/src/sys/nact.h
@@ -218,7 +218,7 @@ private:
 #endif
 	int mouse_x, mouse_y;
 
-	uint32 calc_crc32();
+	uint32 calc_crc32(const char* game_id);
 
 	// Y27 ƒ_ƒCƒAƒ�ƒO
 	void text_dialog();
@@ -231,7 +231,7 @@ private:
 	void release_console();
 
 public:
-	NACT(const char* fontfile);
+	NACT(const char* game_id, const char* font_file);
 	~NACT();
 
 	void mainloop();
@@ -242,7 +242,7 @@ public:
 	void select_cursor();
 	void select_sound(int dev);
 
-	bool get_title(_TCHAR title[], int length);
+	const _TCHAR* get_title();
 
 	bool text_skip_enb;	// ƒ�ƒbƒZ�[ƒWƒXƒLƒbƒv
 	bool text_wait_enb;	// ƒeƒLƒXƒg•\Ž¦‚̃EƒFƒCƒg—LŒø�^–³Œø
diff --git a/src/sys/nact_crc32.cpp b/src/sys/nact_crc32.cpp
index 44896fc..9d341ad 100644
--- a/src/sys/nact_crc32.cpp
+++ b/src/sys/nact_crc32.cpp
@@ -8,8 +8,63 @@
 #include "crc32.h"
 #include "../fileio.h"
 
-uint32 NACT::calc_crc32()
+namespace {
+
+const struct CRCTable {
+	const char* id;
+	uint32 crc32;
+	const _TCHAR* title;
+} crc_table[] = {
+#if defined(_SYSTEM1)
+	{"crescent",        CRC32_CRESCENT,          _T("クレセントムーン��る")},
+	{"dps",             CRC32_DPS,               _T("D.P.S - Dream Program System")},
+	{"fukei",           CRC32_FUKEI,             _T("婦警�んＶＸ")},
+	{"intruder",        CRC32_INTRUDER,          _T("Intruder -桜屋敷�探索-")},
+	{"tengu",           CRC32_TENGU,             _T("�����ん��説")},
+	{"little_vampire",  CRC32_VAMPIRE,           _T("Little Vampire")},
+#elif defined(_SYSTEM2)
+	{"ayumi_proto",     CRC32_AYUMI_PROTO,       _T("�ゆ��ゃん物語 PROTO")},
+	{"sdps_maria",      CRC32_SDPS_MARIA,        _T("Super D.P.S")},
+	{"sdps_tono",       CRC32_SDPS_TONO,         _T("Super D.P.S")},
+	{"sdps_kaizoku",    CRC32_SDPS_KAIZOKU,      _T("Super D.P.S")},
+	{"prog_fd",         CRC32_PROSTUDENTG_FD,    _T("prostudent G")},
+#else // System3
+	{"ambivalenz_fd",   CRC32_AMBIVALENZ_FD,     _T("AmbivalenZ −二律背�−")},
+	{"ambivalenz_cd",   CRC32_AMBIVALENZ_CD,     _T("AmbivalenZ −二律背�−")},
+	{"dps_all",         CRC32_DPSALL,            _T("D.P.S. 全部")},
+	{"funnybee_cd",     CRC32_FUNNYBEE_CD,       _T("宇宙快盗ファニーBee")},
+//	{"funnybee_patch",  CRC32_FUNNYBEE_PATCH,    _T("宇宙快盗ファニーBee")},
+	{"funnybee_fd",     CRC32_FUNNYBEE_FD,       _T("宇宙快盗ファニーBee")},
+	{"onlyyou",         CRC32_ONLYYOU,           _T("Only You −世紀末�ジュリエット�−")},
+	{"onlyyou_demo",    CRC32_ONLYYOU_DEMO,      _T("Only You −世紀末�ジュリエット�− デモ版")},
+	{"prog_cd",         CRC32_PROSTUDENTG_CD,    _T("prostudent G")},
+	{"rance41",         CRC32_RANCE41,           _T("ランス 4.1 〜�薬工場を救��〜")},
+	{"rance42",         CRC32_RANCE42,           _T("ランス 4.2 〜エンジェル組〜")},
+	{"ayumi_cd",        CRC32_AYUMI_CD,          _T("�ゆ��ゃん物語")},
+	{"ayumi_live_256",  CRC32_AYUMI_JISSHA_256,  _T("�ゆ��ゃん物語 実写版")},
+	{"ayumi_live_full", CRC32_AYUMI_JISSHA_FULL, _T("�ゆ��ゃん物語 フルカラー実写版")},
+	{"yakata3_cd",      CRC32_YAKATA3_CD,        _T("アリス�館3")},
+	{"yakata3_fd",      CRC32_YAKATA3_FD,        _T("アリス�館3")},
+	{"hashirionna2",    CRC32_HASHIRIONNA2,      _T("走り女2")},
+	{"toushin2_sp",     CRC32_TOUSHIN2_SP,       _T("闘神都市2 �����れ�ら…")},
+	{"otome",           CRC32_OTOMESENKI,        _T("乙女戦記")},
+	{"ningyo",          CRC32_NINGYO,            _T("人魚 -蘿�-")},
+	{"mugen",           CRC32_MUGENHOUYOU,       _T("夢幻泡影")},
+#endif
+	{NULL, 0, NULL},
+};
+
+} // namespace
+
+uint32 NACT::calc_crc32(const char* game_id)
 {
+	if (game_id) {
+		for (const CRCTable* t = crc_table; t->id; t++) {
+			if (strcmp(t->id, game_id) == 0)
+				return t->crc32;
+		}
+	}
+
 	uint32 crc = 0;
 	FILEIO* fio = new FILEIO();
 	if(fio->Fopen(_T("ADISK.DAT"), FILEIO_READ_BINARY)) {
@@ -69,114 +124,11 @@ uint32 NACT::calc_crc32()
 	return crc;
 }
 
-bool NACT::get_title(_TCHAR title[], int length)
+const _TCHAR* NACT::get_title()
 {
-#if defined(_SYSTEM1)
-
-	switch(crc32) {
-	case CRC32_CRESCENT:
-		_tcscpy_s(title, length, _T("クレセントムーン��る"));
-		return true;
-	case CRC32_DPS:
-		_tcscpy_s(title, length, _T("D.P.S - Dream Program System"));
-		return true;
-	case CRC32_FUKEI:
-		_tcscpy_s(title, length, _T("婦警�んＶＸ"));
-		return true;
-	case CRC32_INTRUDER:
-		_tcscpy_s(title, length, _T("Intruder -桜屋敷�探索-"));
-		return true;
-	case CRC32_TENGU:
-		_tcscpy_s(title, length, _T("�����ん��説"));
-		return true;
-	case CRC32_VAMPIRE:
-		_tcscpy_s(title, length, _T("Little Vampire"));
-		return true;
-	default:
-		title[0] = _T('\0');
-		return false;
+	for (const CRCTable* t = crc_table; t->id; t++) {
+		if (crc32 == t->crc32)
+			return t->title;
 	}
-
-#elif defined(_SYSTEM2)
-
-	switch(crc32) {
-		case CRC32_AYUMI_PROTO:
-			_tcscpy_s(title, length, _T("�ゆ��ゃん物語 PROTO"));
-			return true;
-		case CRC32_SDPS_MARIA:
-		case CRC32_SDPS_TONO:
-		case CRC32_SDPS_KAIZOKU:
-			_tcscpy_s(title, length, _T("Super D.P.S"));
-			return true;
-		case CRC32_PROSTUDENTG_FD:
-			_tcscpy_s(title, length, _T("prostudent G"));
-			return true;
-	}
-	title[0] = _T('\0');
-	return false;
-
-#else
-
-	switch(crc32) {
-		case CRC32_AMBIVALENZ_FD:
-		case CRC32_AMBIVALENZ_CD:
-			_tcscpy_s(title, length, _T("AmbivalenZ −二律背�−"));
-			return true;
-		case CRC32_DPSALL:
-			_tcscpy_s(title, length, _T("D.P.S. 全部"));
-			return true;
-		case CRC32_FUNNYBEE_CD:
-//		case CRC32_FUNNYBEE_PATCH:
-		case CRC32_FUNNYBEE_FD:
-			_tcscpy_s(title, length, _T("宇宙快盗ファニーBee"));
-			return true;
-		case CRC32_ONLYYOU:
-			_tcscpy_s(title, length, _T("Only You −世紀末�ジュリエット�−"));
-			return true;
-		case CRC32_ONLYYOU_DEMO:
-			_tcscpy_s(title, length, _T("Only You −世紀末�ジュリエット�− デモ版"));
-			return true;
-		case CRC32_PROSTUDENTG_CD:
-			_tcscpy_s(title, length, _T("prostudent G"));
-			return true;
-		case CRC32_RANCE41:
-			_tcscpy_s(title, length, _T("ランス 4.1 〜�薬工場を救��〜"));
-			return true;
-		case CRC32_RANCE42:
-			_tcscpy_s(title, length, _T("ランス 4.2 〜エンジェル組〜"));
-			return true;
-		case CRC32_AYUMI_CD:
-			_tcscpy_s(title, length, _T("�ゆ��ゃん物語"));
-			return true;
-		case CRC32_AYUMI_JISSHA_256:
-			_tcscpy_s(title, length, _T("�ゆ��ゃん物語 実写版"));
-			return true;
-		case CRC32_AYUMI_JISSHA_FULL:
-			_tcscpy_s(title, length, _T("�ゆ��ゃん物語 フルカラー実写版"));
-			return true;
-		case CRC32_YAKATA3_CD:
-		case CRC32_YAKATA3_FD:
-			_tcscpy_s(title, length, _T("アリス�館3"));
-			return true;
-		case CRC32_HASHIRIONNA2:
-			_tcscpy_s(title, length, _T("走り女2"));
-			return true;
-		case CRC32_TOUSHIN2_SP:
-			_tcscpy_s(title, length, _T("闘神都市2 �����れ�ら…"));
-			return true;
-		case CRC32_OTOMESENKI:
-			_tcscpy_s(title, length, _T("乙女戦記"));
-			return true;
-		case CRC32_NINGYO:
-			_tcscpy_s(title, length, _T("人魚 -蘿�-"));
-			return true;
-		case CRC32_MUGENHOUYOU:
-			_tcscpy_s(title, length, _T("夢幻泡影"));
-			return true;
-	}
-	title[0] = _T('\0');
-	return false;
-
-#endif
+	return NULL;
 }
-