X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=a60360f9c04db7a7348c4169c9725e8e9ea365ba;hb=8622c9dcd0abc62601ff6c64f93f9294c520ed58;hp=854bbb8518bb09546dc9151130f21ab1e384dc8a;hpb=5bb56b1a0ec9c4875a4b9f532d79ee477a5a6e8e;p=pcsx_rearmed.git

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 854bbb85..a60360f9 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -91,7 +91,7 @@ static void mmssdd( char *b, char *p )
 	time[0] = itob(time[0]); time[1] = itob(time[1]); time[2] = itob(time[2]);
 
 #define READTRACK() \
-	if (CDR_readTrack(time) == -1) return -1; \
+	if (!CDR_readTrack(time)) return -1; \
 	buf = (void *)CDR_getBuffer(); \
 	if (buf == NULL) return -1; \
 	else CheckPPFCache((u8 *)buf, time[0], time[1], time[2]);
@@ -611,7 +611,7 @@ int SaveState(const char *file) {
 	new_dyna_before_save();
 
 	if (drc_is_lightrec() && Config.Cpu != CPU_INTERPRETER)
-		lightrec_plugin_prepare_save_state();
+		lightrec_plugin_sync_regs_to_pcsx();
 
 	SaveFuncs.write(f, (void *)PcsxHeader, 32);
 	SaveFuncs.write(f, (void *)&SaveVersion, sizeof(u32));
@@ -699,7 +699,7 @@ int LoadState(const char *file) {
 	psxRegs.gteBusyCycle = psxRegs.cycle;
 
 	if (drc_is_lightrec() && Config.Cpu != CPU_INTERPRETER)
-		lightrec_plugin_prepare_load_state();
+		lightrec_plugin_sync_regs_from_pcsx();
 
 	if (Config.HLE)
 		psxBiosFreeze(0);
@@ -758,10 +758,13 @@ int SendPcsxInfo() {
 	if (NET_recvData == NULL || NET_sendData == NULL)
 		return 0;
 
+	boolean Sio_old = 0;
+	boolean SpuIrq_old = 0;
+	boolean RCntFix_old = 0;
 	NET_sendData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
-	NET_sendData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
-	NET_sendData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
-	NET_sendData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
+	NET_sendData(&Sio_old, sizeof(Sio_old), PSE_NET_BLOCKING);
+	NET_sendData(&SpuIrq_old, sizeof(SpuIrq_old), PSE_NET_BLOCKING);
+	NET_sendData(&RCntFix_old, sizeof(RCntFix_old), PSE_NET_BLOCKING);
 	NET_sendData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
 	NET_sendData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
 
@@ -774,10 +777,13 @@ int RecvPcsxInfo() {
 	if (NET_recvData == NULL || NET_sendData == NULL)
 		return 0;
 
+	boolean Sio_old = 0;
+	boolean SpuIrq_old = 0;
+	boolean RCntFix_old = 0;
 	NET_recvData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
-	NET_recvData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
-	NET_recvData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
-	NET_recvData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
+	NET_recvData(&Sio_old, sizeof(Sio_old), PSE_NET_BLOCKING);
+	NET_recvData(&SpuIrq_old, sizeof(SpuIrq_old), PSE_NET_BLOCKING);
+	NET_recvData(&RCntFix_old, sizeof(RCntFix_old), PSE_NET_BLOCKING);
 	NET_recvData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
 
 	SysUpdate();