diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-12 05:08:29 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-12 05:08:29 +0000 |
| commit | ce498c067d6ab5ab2b6fadd29ab962a3eec4bbc4 (patch) | |
| tree | 2d7f3e244b306649c18c2f5f8f19992e4e0bd8ad | |
| parent | a91700425ad8b001d852b5d149cefd31cc7cc1ae (diff) | |
| download | pcsxr-ce498c067d6ab5ab2b6fadd29ab962a3eec4bbc4.tar.gz | |
also change osx stuff (unable to fix/compile osx for now)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47878 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | macosx/PcsxController.m | 10 |
2 files changed, 10 insertions, 9 deletions
@@ -1,11 +1,12 @@ May 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> - * libpcsxcore/sio.c: Erase CdromId and CdromLabel when net connection - closed. - * libpcsxcore/psxcommon.h: Use boolean type for config values. - * gui/Config.c: Use TRUE/FALSE for boolean values, enums for long values in + * libpcsxcore/sio.c: Erase CdromId and CdromLabel when net connection closed. + * libpcsxcore/psxcommon.h: Use boolean type for config values, byte for enum + values. + * gui/Config.c: Use TRUE/FALSE for boolean values, enums for byte values in config. * gui/ConfDlg.c: Likewise. + * macosx/PcsxController.m: Likewise. * win32/gui/ConfigurePlugins.c: Likewise. * win32/gui/WndMain.c: Likewise. * libpcsxcore/psxmem.c: Likewise. diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m index 05a6b867..787c791c 100644 --- a/macosx/PcsxController.m +++ b/macosx/PcsxController.m @@ -8,7 +8,7 @@ #include "ExtendedKeys.h" NSDictionary *prefStringKeys; -NSDictionary *prefLongKeys; +NSDictionary *prefByteKeys; NSMutableArray *biosList; NSString *saveStatePath; @@ -246,9 +246,9 @@ NSString *saveStatePath; if (str != nil && dst != nil) strncpy(dst, str, 255); }*/ - enumerator = [prefLongKeys keyEnumerator]; + enumerator = [prefByteKeys keyEnumerator]; while ((key = [enumerator nextObject])) { - long *dst = (long *)[[prefLongKeys objectForKey:key] pointerValue]; + u8 *dst = (u8 *)[[prefByteKeys objectForKey:key] pointerValue]; if (dst != nil) *dst = [defaults integerForKey:key]; } @@ -296,7 +296,7 @@ NSString *saveStatePath; return; } - long *val = (long *)[[prefLongKeys objectForKey:defaultKey] pointerValue]; + u8 *val = (u8 *)[[prefByteKeys objectForKey:defaultKey] pointerValue]; if (val) { [defaults setInteger:*val forKey:defaultKey]; return; @@ -334,7 +334,7 @@ NSString *saveStatePath; [NSValue valueWithPointer:Config.Mcd2], @"Mcd2", nil]; - prefLongKeys = [[NSDictionary alloc] initWithObjectsAndKeys: + prefByteKeys = [[NSDictionary alloc] initWithObjectsAndKeys: [NSValue valueWithPointer:&Config.Xa], @"NoXaAudio", [NSValue valueWithPointer:&Config.Sio], @"SioIrqAlways", [NSValue valueWithPointer:&Config.Mdec], @"BlackAndWhiteMDECVideo", |