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
frontend: savestate autoload support
[pcsx_rearmed.git]
/
libpcsxcore
/
misc.c
diff --git
a/libpcsxcore/misc.c
b/libpcsxcore/misc.c
index
14f68ec
..
58170cf
100644
(file)
--- a/
libpcsxcore/misc.c
+++ b/
libpcsxcore/misc.c
@@
-208,9
+208,9
@@
int LoadCdrom() {
// read the SYSTEM.CNF
READTRACK();
// read the SYSTEM.CNF
READTRACK();
- sscanf((char *)buf + 12, "BOOT = cdrom:\\%25
6
s", exename);
+ sscanf((char *)buf + 12, "BOOT = cdrom:\\%25
5
s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
if (GetCdromFile(mdir, time, exename) == -1) {
- sscanf((char *)buf + 12, "BOOT = cdrom:%25
6
s", exename);
+ sscanf((char *)buf + 12, "BOOT = cdrom:%25
5
s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr((char *)buf + 12, "cdrom:");
if (ptr != NULL) {
if (GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr((char *)buf + 12, "cdrom:");
if (ptr != NULL) {
@@
-268,7
+268,7
@@
int LoadCdromFile(const char *filename, EXE_HEADER *head) {
u32 size, addr;
void *mem;
u32 size, addr;
void *mem;
- sscanf(filename, "cdrom:\\%25
6
s", exename);
+ sscanf(filename, "cdrom:\\%25
5
s", exename);
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
@@
-338,9
+338,9
@@
int CheckCdrom() {
if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") != -1) {
READTRACK();
if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") != -1) {
READTRACK();
- sscanf(buf + 12, "BOOT = cdrom:\\%25
6
s", exename);
+ sscanf(buf + 12, "BOOT = cdrom:\\%25
5
s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
if (GetCdromFile(mdir, time, exename) == -1) {
- sscanf(buf + 12, "BOOT = cdrom:%25
6
s", exename);
+ sscanf(buf + 12, "BOOT = cdrom:%25
5
s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr(buf + 12, "cdrom:"); // possibly the executable is in some subdir
if (ptr != NULL) {
if (GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr(buf + 12, "cdrom:"); // possibly the executable is in some subdir
if (ptr != NULL) {
@@
-573,7
+573,7
@@
int SaveState(const char *file) {
f = SaveFuncs.open(file, "wb");
if (f == NULL) return -1;
f = SaveFuncs.open(file, "wb");
if (f == NULL) return -1;
- new_dyna_save();
+ new_dyna_
before_
save();
SaveFuncs.write(f, (void *)PcsxHeader, 32);
SaveFuncs.write(f, (void *)&SaveVersion, sizeof(u32));
SaveFuncs.write(f, (void *)PcsxHeader, 32);
SaveFuncs.write(f, (void *)&SaveVersion, sizeof(u32));
@@
-615,6
+615,7
@@
int SaveState(const char *file) {
psxHwFreeze(f, 1);
psxRcntFreeze(f, 1);
mdecFreeze(f, 1);
psxHwFreeze(f, 1);
psxRcntFreeze(f, 1);
mdecFreeze(f, 1);
+ new_dyna_freeze(f, 1);
SaveFuncs.close(f);
SaveFuncs.close(f);
@@
-679,9
+680,9
@@
int LoadState(const char *file) {
psxHwFreeze(f, 0);
psxRcntFreeze(f, 0);
mdecFreeze(f, 0);
psxHwFreeze(f, 0);
psxRcntFreeze(f, 0);
mdecFreeze(f, 0);
+ new_dyna_freeze(f, 0);
SaveFuncs.close(f);
SaveFuncs.close(f);
- new_dyna_restore();
return 0;
}
return 0;
}