diff --git a/BizHawk.MultiClient/output/dll/libyabause.dll b/BizHawk.MultiClient/output/dll/libyabause.dll index 909a2d4957..35f27b4651 100644 Binary files a/BizHawk.MultiClient/output/dll/libyabause.dll and b/BizHawk.MultiClient/output/dll/libyabause.dll differ diff --git a/yabause/src/libyabause/libyabause.vcxproj b/yabause/src/libyabause/libyabause.vcxproj index 9037a1d759..1b8bd6f722 100644 --- a/yabause/src/libyabause/libyabause.vcxproj +++ b/yabause/src/libyabause/libyabause.vcxproj @@ -105,7 +105,6 @@ - diff --git a/yabause/src/libyabause/libyabause.vcxproj.filters b/yabause/src/libyabause/libyabause.vcxproj.filters index 9497b872cb..3c30dacc79 100644 --- a/yabause/src/libyabause/libyabause.vcxproj.filters +++ b/yabause/src/libyabause/libyabause.vcxproj.filters @@ -93,9 +93,6 @@ Source Files - - Source Files - Source Files diff --git a/yabause/src/memory.c b/yabause/src/memory.c index fcf8309776..c4d40ad8e0 100644 --- a/yabause/src/memory.c +++ b/yabause/src/memory.c @@ -1067,8 +1067,8 @@ int YabSaveState(const char *filename) ywrite(&check, (void *)&temp, sizeof(int), 1, fp); temp = (yabsys.CurSH2FreqType == CLKTYPE_26MHZ) ? 268 : 286; ywrite(&check, (void *)&temp, sizeof(int), 1, fp); - temp32 = (yabsys.UsecFrac * temp / 10) >> YABSYS_TIMING_BITS; - ywrite(&check, (void *)&temp32, sizeof(u32), 1, fp); + //temp32 = (yabsys.UsecFrac * temp / 10) >> YABSYS_TIMING_BITS; + ywrite(&check, (void *)&yabsys.UsecFrac, sizeof(u32), 1, fp); ywrite(&check, (void *)&yabsys.CurSH2FreqType, sizeof(int), 1, fp); ywrite(&check, (void *)&yabsys.IsPal, sizeof(int), 1, fp); /* @@ -1299,11 +1299,11 @@ int YabLoadState(const char *filename) yread(&check, (void *)&yabsys.MaxLineCount, sizeof(int), 1, fp); yread(&check, (void *)&temp, sizeof(int), 1, fp); yread(&check, (void *)&temp, sizeof(int), 1, fp); - yread(&check, (void *)&temp32, sizeof(u32), 1, fp); + yread(&check, (void *)&yabsys.UsecFrac, sizeof(u32), 1, fp); yread(&check, (void *)&yabsys.CurSH2FreqType, sizeof(int), 1, fp); yread(&check, (void *)&yabsys.IsPal, sizeof(int), 1, fp); - YabauseChangeTiming(yabsys.CurSH2FreqType); - yabsys.UsecFrac = (temp32 << YABSYS_TIMING_BITS) * temp / 10; + //YabauseChangeTiming(yabsys.CurSH2FreqType); + //yabsys.UsecFrac = (temp32 << YABSYS_TIMING_BITS) * temp / 10; if (headerversion > 1) {