summaryrefslogtreecommitdiff
path: root/libpcsxcore/misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'libpcsxcore/misc.c')
-rw-r--r--libpcsxcore/misc.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index def43ee8..55170f00 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -331,7 +331,10 @@ int CheckCdrom() {
}
if (Config.PsxAuto) { // autodetect system (pal or ntsc)
- if( CdromId[2] == 'e' || CdromId[2] == 'E' )
+ if((CdromId[2] == 'e') || (CdromId[2] == 'E') ||
+ !strncmp(CdromId, "PBPX95001", 10) || // according to redump.org, these PAL
+ !strncmp(CdromId, "PBPX95007", 10) || // demos have a non-standard ID;
+ !strncmp(CdromId, "PBPX95008", 10)) // add more serials if they are discovered.
Config.PsxType = PSX_TYPE_PAL; // pal
else Config.PsxType = PSX_TYPE_NTSC; // ntsc
}
@@ -376,14 +379,14 @@ static void LoadLibPS() {
char buf[MAXPATHLEN];
FILE *f;
- // Load Net Yaroze runtime library (if exists)
- sprintf(buf, "%s/libps.exe", Config.BiosDir);
- f = fopen(buf, "rb");
-
- if (f != NULL) {
- fseek(f, 0x800, SEEK_SET);
- fread(psxM + 0x10000, 0x61000, 1, f);
- fclose(f);
+ // Load Net Yaroze runtime library (if exists)
+ sprintf(buf, "%s/libps.exe", Config.BiosDir);
+ f = fopen(buf, "rb");
+
+ if (f != NULL) {
+ fseek(f, 0x800, SEEK_SET);
+ fread(psxM + 0x10000, 0x61000, 1, f);
+ fclose(f);
}
}