From e2f664d6b915bff734917bf623dd97a2083e4bff Mon Sep 17 00:00:00 2001 From: goyuken Date: Fri, 3 May 2013 00:13:12 +0000 Subject: [PATCH] saturn: disable built in OSD multiclient: disable "try arcade rewind hack" message when core is not PCE --- BizHawk.MultiClient/Rewind.cs | 3 ++- BizHawk.MultiClient/output/dll/libyabause.dll | Bin 563200 -> 563200 bytes yabause/src/libyabause/yui.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/Rewind.cs b/BizHawk.MultiClient/Rewind.cs index 839f00aeb4..8527decdf7 100644 --- a/BizHawk.MultiClient/Rewind.cs +++ b/BizHawk.MultiClient/Rewind.cs @@ -22,7 +22,8 @@ namespace BizHawk.MultiClient RewindImpossible = true; LastState = null; Global.OSD.AddMessage("Rewind Disabled: State too large."); - Global.OSD.AddMessage("See 'Arcade Card Rewind Hack' in Emulation->PC Engine options."); + if (Global.Emulator.SystemId == "PCE") + Global.OSD.AddMessage("See 'Arcade Card Rewind Hack' in Emulation->PC Engine options."); } return; diff --git a/BizHawk.MultiClient/output/dll/libyabause.dll b/BizHawk.MultiClient/output/dll/libyabause.dll index 634c9edfe013bc55b2f4a88b4c0401f30a0a8940..1e27372ff7d646f03ecd724581049978984afbca 100644 GIT binary patch delta 4230 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 delta 4059 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 diff --git a/yabause/src/libyabause/yui.cpp b/yabause/src/libyabause/yui.cpp index abafc87e98..38e3472de1 100644 --- a/yabause/src/libyabause/yui.cpp +++ b/yabause/src/libyabause/yui.cpp @@ -258,6 +258,8 @@ extern "C" __declspec(dllexport) int libyabause_init(CDInterface *_CD, const cha DisableAutoFrameSkip(); ScspSetFrameAccurate(1); + OSDChangeCore(OSDCORE_DUMMY); + ctrl1 = PerPadAdd(&PORTDATA1); ctrl2 = PerPadAdd(&PORTDATA2);