diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gui/AboutDlg.c | 4 | ||||
| -rw-r--r-- | libpcsxcore/psxmem.c | 2 | ||||
| -rw-r--r-- | libpcsxcore/sio.c | 7 |
5 files changed, 14 insertions, 5 deletions
@@ -27,7 +27,7 @@ PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project) maggix (Snow Leopard compile fix) NeToU (Bugfix) Peter Collingbourne (Various core/psxbios fixes) - shalma (Various core fixes) + shalma (GTE Divider, various core fixes) Tristin Celestin (PulseAudio support) Wei Mingzhi (Maintainer, input plugin, iso/cheat support, misc stuff) @@ -1,7 +1,7 @@ May 23, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> - * AUTHORS: Updated on request. - * gui/AboutDlg.c: Likewise. + * AUTHORS: Updated info. + * gui/AboutDlg.c: Likewise, and fixed FTBFS on SLED 10. * gui/MemcardDlg.c: Show Japanese titles properly. * libpcsxcore/sio.h: Likewise. * libpcsxcore/sio.c: Likewise. diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index 03b62580..0cc1fe8c 100644 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -19,6 +19,10 @@ #include "Linux.h" #include <gtk/gtk.h> +#if GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 12 +#define gtk_about_dialog_set_program_name gtk_about_dialog_set_name +#endif + #define ABOUT_VERSION "svn" void RunAboutDialog(void) { diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index 9d67c465..47c1ef12 100644 --- a/libpcsxcore/psxmem.c +++ b/libpcsxcore/psxmem.c @@ -21,6 +21,8 @@ * PSX memory functions. */ +// TODO: Implement caches & cycle penalty. + #include "psxmem.h" #include "r3000a.h" #include "psxhw.h" diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c index f0655cd9..a31d6ee7 100644 --- a/libpcsxcore/sio.c +++ b/libpcsxcore/sio.c @@ -181,8 +181,8 @@ void sioWrite8(unsigned char value) { { char xor = 0; int i; - for (i=2;i<128+4;i++) - xor^=buf[i]; + for (i = 2; i < 128 + 4; i++) + xor ^= buf[i]; buf[132] = xor; } buf[133] = 0x47; @@ -721,6 +721,9 @@ void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) { ptr += 2; } + trim(str); + trim(sstr); + ptr = data + block * 8192 + 0x60; // icon palette data for (i = 0; i < 16; i++) { |