notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: merge part of old Ari64's patch: 09_tlb_offset
[pcsx_rearmed.git]
/
libpcsxcore
/
misc.c
diff --git
a/libpcsxcore/misc.c
b/libpcsxcore/misc.c
index
d743b34
..
7353c3b
100644
(file)
--- a/
libpcsxcore/misc.c
+++ b/
libpcsxcore/misc.c
@@
-333,7
+333,7
@@
int CheckCdrom() {
}
if (Config.PsxAuto) { // autodetect system (pal or ntsc)
}
if (Config.PsxAuto) { // autodetect system (pal or ntsc)
- if (
strstr(exename, "ES") != NULL
)
+ if (
CdromId[2] == 'e' || CdromId[2] == 'E'
)
Config.PsxType = PSX_TYPE_PAL; // pal
else Config.PsxType = PSX_TYPE_NTSC; // ntsc
}
Config.PsxType = PSX_TYPE_PAL; // pal
else Config.PsxType = PSX_TYPE_NTSC; // ntsc
}
@@
-458,7
+458,7
@@
static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION;
// Savestate Versioning!
// If you make changes to the savestate version, please increment the value below.
// Savestate Versioning!
// If you make changes to the savestate version, please increment the value below.
-static const u32 SaveVersion = 0x8b41000
5
;
+static const u32 SaveVersion = 0x8b41000
6
;
int SaveState(const char *file) {
gzFile f;
int SaveState(const char *file) {
gzFile f;
@@
-534,10
+534,14
@@
int LoadState(const char *file) {
gzread(f, &version, sizeof(u32));
gzread(f, &hle, sizeof(boolean));
gzread(f, &version, sizeof(u32));
gzread(f, &hle, sizeof(boolean));
- if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion
|| hle != Config.HLE
) {
+ if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion) {
gzclose(f);
return -1;
}
gzclose(f);
return -1;
}
+ Config.HLE = hle;
+
+ if (Config.HLE)
+ psxBiosInit();
psxCpu->Reset();
gzseek(f, 128 * 96 * 3, SEEK_CUR);
psxCpu->Reset();
gzseek(f, 128 * 96 * 3, SEEK_CUR);
@@
-590,7
+594,7
@@
int CheckState(const char *file) {
gzclose(f);
gzclose(f);
- if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion
|| hle != Config.HLE
)
+ if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion)
return -1;
return 0;
return -1;
return 0;