diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-27 03:02:25 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-27 03:02:25 +0000 |
| commit | e832ac97861db3896e6771d091eb952c706dd101 (patch) | |
| tree | 75f96c74a21527244701f0c9032a46c0170de3f4 /libpcsxcore/misc.c | |
| parent | 3f28bbe662d843c6cd3e073e44752f0f28560a02 (diff) | |
| download | pcsxr-e832ac97861db3896e6771d091eb952c706dd101.tar.gz | |
* Removed unnecessary files.
* Clean up build system (Issue #7815, VoidMage).
* properly init some variables on reset (Patch #7887, notaz).
* dfxvideo: several fixes to FPS bar (Patch #7879, dario86).
* Region autodetection for 3 PAL demos (Patch #7879, dario86).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61512 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/misc.c')
| -rw-r--r-- | libpcsxcore/misc.c | 21 |
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); } } |