diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-11-13 19:08:53 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-11-13 19:08:53 +0000 |
| commit | 63813715f8c0d961bccf35faf6abb2287c3ebc0b (patch) | |
| tree | 3f07e9ef35ccf382c0c3a4ed0b0e7c859442dad1 | |
| parent | 1068fd8f6ed61fe8eaab07a7ecffe41f697cad9e (diff) | |
| download | pcsxr-63813715f8c0d961bccf35faf6abb2287c3ebc0b.tar.gz | |
F12 - reset, a bit buggy.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@59548 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | gui/Plugin.c | 7 | ||||
| -rw-r--r-- | win32/gui/plugin.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gui/Plugin.c b/gui/Plugin.c index e510aed1..ed687d03 100644 --- a/gui/Plugin.c +++ b/gui/Plugin.c @@ -265,7 +265,10 @@ void PADhandleKey(int key) { LidInterrupt();
break; - case XK_Escape: + case XK_F12: + psxReset(); + break; + case XK_Escape: // TODO // the architecture is too broken to actually restart the GUI // because SysUpdate is called from deep within the actual @@ -289,7 +292,7 @@ void PADhandleKey(int key) { default: GPU_keypressed(key); if (Config.UseNet) NET_keypressed(key); - } + } } void OnFile_Exit(); diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c index d884dbe7..88c51bfc 100644 --- a/win32/gui/plugin.c +++ b/win32/gui/plugin.c @@ -157,7 +157,7 @@ void PADhandleKey(int key) { case VK_F12:
SysPrintf("*PCSX*: CpuReset\n");
- psxCpu->Reset();
+ psxReset();
break;
case VK_ESCAPE:
@@ -301,7 +301,7 @@ int OpenPlugins(HWND hWnd, int internaliso) { LoadMcds(Config.Mcd1, Config.Mcd2);
if (LoadPlugins() == -1) return -1;
}
- return ret;
+ return ret;
}
void ClosePlugins() {
@@ -333,7 +333,7 @@ void ResetPlugins() { SPU_shutdown();
PAD1_shutdown();
PAD2_shutdown();
- if (Config.UseNet) NET_shutdown();
+ if (Config.UseNet) NET_shutdown();
ret = CDR_init();
if (ret != 0) { SysMessage (_("CDRinit error: %d"), ret); return; }
|