diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-03-28 21:47:05 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-03-28 21:47:05 +0000 |
| commit | a92f831335493c2ed789a3f746861af49ef5e4c8 (patch) | |
| tree | 7d423b62aa08268aa067e9d9c014d289c347e978 /macosx/Plugin.c | |
| parent | b7761528326a064c81aaba3ebc275b394b3e1283 (diff) | |
| download | pcsxr-a92f831335493c2ed789a3f746861af49ef5e4c8.tar.gz | |
OS X:
Tell PCSX-R to push the save state status text to the GUI after emulation resumes.
Tweak the networking a small bit.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89708 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Plugin.c')
| -rwxr-xr-x | macosx/Plugin.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/macosx/Plugin.c b/macosx/Plugin.c index e5cc65d3..b9e7ff4a 100755 --- a/macosx/Plugin.c +++ b/macosx/Plugin.c @@ -47,8 +47,8 @@ void PADhandleKey(int key) { #ifdef ENABLE_SIO1API SIO1_keypressed(key); #endif - if (Config.UseNet) NET_keypressed(key); - + if (Config.UseNet) + NET_keypressed(key); } long PAD1__open(void) { @@ -64,8 +64,6 @@ void SignalExit(int sig) { OnFile_Exit(); } -void SPUirq(void); - #define PARSEPATH(dst, src) \ ptr = src + strlen(src); \ while (*ptr != '\\' && ptr != src) ptr--; \ @@ -103,7 +101,7 @@ int _OpenPlugins() { netInfo info; char path[MAXPATHLEN]; - strcpy(info.EmuName, "PCSX " PACKAGE_VERSION); + strcpy(info.EmuName, "PCSXR " PACKAGE_VERSION); strncpy(info.CdromID, CdromId, 9); strncpy(info.CdromLabel, CdromLabel, 11); info.psxMem = psxM; @@ -142,13 +140,11 @@ int _OpenPlugins() { Config.UseNet = FALSE; } } else { - if (NET_queryPlayer() == 1) { if (SendPcsxInfo() == -1) Config.UseNet = FALSE; } else { if (RecvPcsxInfo() == -1) Config.UseNet = FALSE; } - } NetOpened = TRUE; } else if (Config.UseNet) { |