X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=917a56777b7936699784f3dcaa4a7451a7ae8b64;hp=874624ddf1289ad9b75c233b89aecb2eaa455003;hb=650adfd2da779ba8855623362c2900583e22931e;hpb=7e443736093de5288ad616be550b47e0072674d2

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 874624dd..917a5677 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -109,6 +109,7 @@ void mmssdd( char *b, char *p )
 
 int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
 	struct iso_directory_record *dir;
+	int retval = -1;
 	u8 ddir[4096];
 	u8 *buf;
 	int i;
@@ -122,7 +123,7 @@ int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
 		if (dir->length[0] == 0) {
 			return -1;
 		}
-		i += dir->length[0];
+		i += (u8)dir->length[0];
 
 		if (dir->flags[0] & 0x2) { // it's a dir
 			if (!strnicmp((char *)&dir->name[0], filename, dir->name_len[0])) {
@@ -138,11 +139,12 @@ int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
 		} else {
 			if (!strnicmp((char *)&dir->name[0], filename, strlen(filename))) {
 				mmssdd(dir->extent, (char *)time);
+				retval = 0;
 				break;
 			}
 		}
 	}
-	return 0;
+	return retval;
 }
 
 static const unsigned int gpu_ctl_def[] = {
@@ -599,11 +601,11 @@ int SaveState(const char *file) {
 
 	// spu
 	spufP = (SPUFreeze_t *) malloc(16);
-	SPU_freeze(2, spufP);
+	SPU_freeze(2, spufP, psxRegs.cycle);
 	Size = spufP->Size; SaveFuncs.write(f, &Size, 4);
 	free(spufP);
 	spufP = (SPUFreeze_t *) malloc(Size);
-	SPU_freeze(1, spufP);
+	SPU_freeze(1, spufP, psxRegs.cycle);
 	SaveFuncs.write(f, spufP, Size);
 	free(spufP);
 
@@ -668,7 +670,7 @@ int LoadState(const char *file) {
 	SaveFuncs.read(f, &Size, 4);
 	spufP = (SPUFreeze_t *)malloc(Size);
 	SaveFuncs.read(f, spufP, Size);
-	SPU_freeze(0, spufP);
+	SPU_freeze(0, spufP, psxRegs.cycle);
 	free(spufP);
 
 	sioFreeze(f, 0);