diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2018-04-27 12:18:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 12:18:49 +0100 |
| commit | 7936d466c58f6f2603900fbbc9d18b56ac2e4b4c (patch) | |
| tree | 714d9f371901f7083cf38fc547d46df32d16f16e /macosx/Source | |
| parent | 6f76041029393c6823973a29426b28c8c2d0b064 (diff) | |
| parent | 5687e9684cccc74e9dfa040c59a04d61e0851d54 (diff) | |
| download | pcsxr-7936d466c58f6f2603900fbbc9d18b56ac2e4b4c.tar.gz | |
Merge pull request #8 from loathingKernel/travis
Add Travis CI support for Linux and OS X
Diffstat (limited to 'macosx/Source')
| -rw-r--r-- | macosx/Source/PcsxrMemCardArray.m | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macosx/Source/PcsxrMemCardArray.m b/macosx/Source/PcsxrMemCardArray.m index 83a9f6c5..cf01e15b 100644 --- a/macosx/Source/PcsxrMemCardArray.m +++ b/macosx/Source/PcsxrMemCardArray.m @@ -16,11 +16,11 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha { // header memmove(to + (dsti + 1) * 128, from + (srci + 1) * 128, 128); - SaveMcd(0, str, to, (dsti + 1) * 128, 128); + SaveMcd(str, to, (dsti + 1) * 128, 128); // data memmove(to + (dsti + 1) * 1024 * 8, from + (srci+1) * 1024 * 8, 1024 * 8); - SaveMcd(0, str, to, (dsti + 1) * 1024 * 8, 1024 * 8); + SaveMcd(str, to, (dsti + 1) * 1024 * 8, 1024 * 8); } static inline char* BlankHeader() @@ -56,11 +56,11 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) // header char *header = BlankHeader(); memcpy(to + (dsti + 1) * 128, header, 128); - SaveMcd(0, str, to, (dsti + 1) * 128, 128); + SaveMcd(str, to, (dsti + 1) * 128, 128); // data memset(to + (dsti + 1) * 1024 * 8, 0, 1024 * 8); - SaveMcd(0, str, to, (dsti + 1) * 1024 * 8, 1024 * 8); + SaveMcd(str, to, (dsti + 1) * 1024 * 8, 1024 * 8); } @interface PcsxrMemCardArray () @@ -338,7 +338,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) for (unsigned char j = 0; j < 127; j++) xor ^= *ptr++; *ptr = xor; - SaveMcd(0, filename, data, i * 128, 128); + SaveMcd(filename, data, i * 128, 128); } } |