From 314f1bd8c5f09024cc48ef06891af26351d07753 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 4 Apr 2015 22:33:06 +0000 Subject: [PATCH] Fixed the ROM info compare in the e-Reader emulation --- src/gba/ereader.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/gba/ereader.cpp b/src/gba/ereader.cpp index 733770b8..bbf64b01 100644 --- a/src/gba/ereader.cpp +++ b/src/gba/ereader.cpp @@ -8,15 +8,6 @@ #include "Globals.h" #include "ereader.h" - -//#include "win32/stdafx.h" -//#include "win32/vba.h" -//#include "win32/MainWnd.h" -//#include "win32/FileDlg.h" -//#include "win32/WinResUtil.h" -//#include "win32/MainWnd.h" - - int eReaderEnabled = 1; char US_Ereader[19] = "CARDE READERPSAE01"; @@ -100,6 +91,10 @@ char filebuffer[2048]; int dotcodesize; +#if (defined __WIN32__ || defined _WIN32) +#define strcasecmp _stricmp +#endif + int CheckEReaderRegion(void) //US = 1, JAP = 2, JAP+ = 3 { int i; @@ -107,11 +102,11 @@ int CheckEReaderRegion(void) //US = 1, JAP = 2, JAP+ = 3 rom_info[i] = rom[0xA0+i]; rom_info[i] = 0; - if (std::tolower(*rom_info, std::locale()) == std::tolower(*US_Ereader, std::locale())) + if (!strcasecmp(rom_info, US_Ereader)) return 1; - if (std::tolower(*rom_info, std::locale()) == std::tolower(*JAP_Ereader, std::locale())) + if (!strcasecmp(rom_info, JAP_Ereader)) return 2; - if (std::tolower(*rom_info, std::locale()) == std::tolower(*JAP_Ereader_plus, std::locale())) + if (!strcasecmp(rom_info, JAP_Ereader_plus)) return 3; return 0;