Remove tchar.h shim

This commit is contained in:
kichikuou
2020-02-16 15:57:05 +09:00
parent 1f5449687f
commit 387c5febf2
20 changed files with 129 additions and 138 deletions
+36 -36
View File
@@ -13,43 +13,43 @@ namespace {
const struct CRCTable {
const char* id;
uint32 crc32;
const _TCHAR* title;
const char* title;
} crc_table[] = {
#if defined(_SYSTEM1)
{"crescent", CRC32_CRESCENT, _T("クレセントムーンがぁる")},
{"dps", CRC32_DPS, _T("D.P.S - Dream Program System")},
{"fukei", CRC32_FUKEI, _T("婦警さんVX")},
{"intruder", CRC32_INTRUDER, _T("Intruder -桜屋敷の探索-")},
{"tengu", CRC32_TENGU, _T("あぶないてんぐ伝説")},
{"little_vampire", CRC32_VAMPIRE, _T("Little Vampire")},
{"crescent", CRC32_CRESCENT, "クレセントムーンがぁる"},
{"dps", CRC32_DPS, "D.P.S - Dream Program System"},
{"fukei", CRC32_FUKEI, "婦警さんVX"},
{"intruder", CRC32_INTRUDER, "Intruder -桜屋敷の探索-"},
{"tengu", CRC32_TENGU, "あぶないてんぐ伝説"},
{"little_vampire", CRC32_VAMPIRE, "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")},
{"ayumi_proto", CRC32_AYUMI_PROTO, "あゆみちゃん物語 PROTO"},
{"sdps_maria", CRC32_SDPS_MARIA, "Super D.P.S"},
{"sdps_tono", CRC32_SDPS_TONO, "Super D.P.S"},
{"sdps_kaizoku", CRC32_SDPS_KAIZOKU, "Super D.P.S"},
{"prog_fd", CRC32_PROSTUDENTG_FD, "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("夢幻泡影")},
{"ambivalenz_fd", CRC32_AMBIVALENZ_FD, "AmbivalenZ −二律背反−"},
{"ambivalenz_cd", CRC32_AMBIVALENZ_CD, "AmbivalenZ −二律背反−"},
{"dps_all", CRC32_DPSALL, "D.P.S. 全部"},
{"funnybee_cd", CRC32_FUNNYBEE_CD, "宇宙快盗ファニーBee"},
// {"funnybee_patch", CRC32_FUNNYBEE_PATCH, "宇宙快盗ファニーBee"},
{"funnybee_fd", CRC32_FUNNYBEE_FD, "宇宙快盗ファニーBee"},
{"onlyyou", CRC32_ONLYYOU, "Only You −世紀末のジュリエット達−"},
{"onlyyou_demo", CRC32_ONLYYOU_DEMO, "Only You −世紀末のジュリエット達− デモ版"},
{"prog_cd", CRC32_PROSTUDENTG_CD, "prostudent G"},
{"rance41", CRC32_RANCE41, "ランス 4.1 〜お薬工場を救え!〜"},
{"rance42", CRC32_RANCE42, "ランス 4.2 〜エンジェル組〜"},
{"ayumi_cd", CRC32_AYUMI_CD, "あゆみちゃん物語"},
{"ayumi_live_256", CRC32_AYUMI_JISSHA_256, "あゆみちゃん物語 実写版"},
{"ayumi_live_full", CRC32_AYUMI_JISSHA_FULL, "あゆみちゃん物語 フルカラー実写版"},
{"yakata3_cd", CRC32_YAKATA3_CD, "アリスの館3"},
{"yakata3_fd", CRC32_YAKATA3_FD, "アリスの館3"},
{"hashirionna2", CRC32_HASHIRIONNA2, "走り女2"},
{"toushin2_sp", CRC32_TOUSHIN2_SP, "闘神都市2 そして、それから…"},
{"otome", CRC32_OTOMESENKI, "乙女戦記"},
{"ningyo", CRC32_NINGYO, "人魚 -蘿子-"},
{"mugen", CRC32_MUGENHOUYOU, "夢幻泡影"},
#endif
{NULL, 0, NULL},
};
@@ -67,7 +67,7 @@ uint32 NACT::calc_crc32(const char* game_id)
uint32 crc = 0;
FILEIO* fio = new FILEIO();
if(fio->Fopen(_T("ADISK.DAT"), FILEIO_READ_BINARY)) {
if(fio->Fopen("ADISK.DAT", FILEIO_READ_BINARY)) {
uint32 table[256];
for(int i = 0; i < 256; i++) {
uint32 c = i;
@@ -92,7 +92,7 @@ uint32 NACT::calc_crc32(const char* game_id)
#if defined(_SYSTEM2)
if(crc == CRC32_SDPS) {
// Super D.P.Sの場合はBDISK.DATのCRCを取る
if(fio->Fopen(_T("BDISK.DAT"), FILEIO_READ_BINARY)) {
if(fio->Fopen("BDISK.DAT", FILEIO_READ_BINARY)) {
uint32 table[256];
for(int i = 0; i < 256; i++) {
uint32 c = i;
@@ -133,7 +133,7 @@ const char* NACT::get_game_id()
return NULL;
}
const _TCHAR* NACT::get_title()
const char* NACT::get_title()
{
for (const CRCTable* t = crc_table; t->id; t++) {
if (crc32 == t->crc32)