diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-12-20 23:32:58 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-12-20 23:32:58 +0000 |
| commit | f3600caa4ba5d0b3755057a17de9425b4fa51b17 (patch) | |
| tree | 57de4a1ab10c993785d7b102d68570305cbf222b | |
| parent | e6ac6b9c85f96e3409a36d4c22564a15e9d876f6 (diff) | |
| download | pcsxr-f3600caa4ba5d0b3755057a17de9425b4fa51b17.tar.gz | |
Adding my name to the Coders list in Credits.rtf.
We should directly access instance variables instead of calling getters/setters on PcsxrMemoryObject's init method.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@73578 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | macosx/English.lproj/Credits.rtf | 30 | ||||
| -rw-r--r-- | macosx/PcsxrMemoryObject.m | 22 |
2 files changed, 27 insertions, 25 deletions
diff --git a/macosx/English.lproj/Credits.rtf b/macosx/English.lproj/Credits.rtf index a7870f8a..3bca8c79 100644 --- a/macosx/English.lproj/Credits.rtf +++ b/macosx/English.lproj/Credits.rtf @@ -1,28 +1,30 @@ -{\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} +{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\vieww10800\viewh8400\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\b\fs24 \cf0 Macintosh Port: -\f1\b0 \ +\b0 \ Gil Pedersen\ \ -\f0\b Icon Design: -\f1\b0 \ +\b Icon Design: +\b0 \ Romain Lafourcade\ \ -\f0\b Original Coders: -\f1\b0 \ +\b Original Coders: +\b0 \ Linuzappz\ - Shadow\ - Pete Bernert\ - NoComp\ - Nik3d\ + Shadow\ + Pete Bernert\ + NoComp\ + Nik3d\ + Madd the Sane\ \ -\f0\b Macintosh Testing: -\f1\b0 \ +\b Macintosh Testing: +\b0 \ Richard Banister\ Many others}
\ No newline at end of file diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index aa5c7b44..fcaad514 100644 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -51,23 +51,23 @@ - (id)initWithMcdBlock:(McdBlock *)infoBlock { if (self = [super init]) { - self.englishName = [NSString stringWithCString:infoBlock->Title encoding:NSASCIIStringEncoding]; - self.sjisName = [NSString stringWithCString:infoBlock->sTitle encoding:NSShiftJISStringEncoding]; - self.memImage = [PcsxrMemoryObject imageFromMcd:infoBlock->Icon]; - self.memName = [NSString stringWithCString:infoBlock->Name encoding:NSASCIIStringEncoding]; - self.memID = [NSString stringWithCString:infoBlock->ID encoding:NSASCIIStringEncoding]; - self.memIconCount = infoBlock->IconCount; - self.memFlags = infoBlock->Flags; + englishName = [[NSString alloc] initWithCString:infoBlock->Title encoding:NSASCIIStringEncoding]; + sjisName = [[NSString alloc] initWithCString:infoBlock->sTitle encoding:NSShiftJISStringEncoding]; + memImage = [[PcsxrMemoryObject imageFromMcd:infoBlock->Icon] retain]; + memName = [[NSString alloc] initWithCString:infoBlock->Name encoding:NSASCIIStringEncoding]; + memID = [[NSString alloc] initWithCString:infoBlock->ID encoding:NSASCIIStringEncoding]; + memIconCount = infoBlock->IconCount; + memFlags = infoBlock->Flags; if ((infoBlock->Flags & 0xF0) == 0xA0) { if ((infoBlock->Flags & 0xF) >= 1 && (infoBlock->Flags & 0xF) <= 3) { - self.notDeleted = NO; + notDeleted = NO; } else - self.notDeleted = NO; + notDeleted = NO; } else if ((infoBlock->Flags & 0xF0) == 0x50) - self.notDeleted = YES; + notDeleted = YES; else - self.notDeleted = NO; + notDeleted = NO; } return self; |