Mac replay system don't use UserDefaults for replays #576
+84
−107
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Are you able to update the Xcode 4 project too or does that require actually using an older computer? (I can do it on my old computer if there's issues.) |
|
I can't remember if I've tried doing that before. Just stepped away from the computer though so I can't try till later. |
|
The Xcode 4 project doesn't build currently (in Xcode 4 at least) so it's not a priority, but if it's easy then you might as well do it? |
|
I'll try it later, and I think there's another variant of the do_load crash that I can easily fix. |
|
Ok, those two things are done. |
|
I think this is roughly ready to merge, but I'm probably going to do it manually and squash up some of the commits. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #456
This is a more proper fix for the problem than #569 was.
Mac builds now include all of the text and map-based preference parsing code that windows/linux do. When the game is run as a replay, this code gets used and NSUserDefaults never come into play at all.
I've used some devilish compiler macros to make the code relatively DRY for the universal preferences code to redirect to mac-specific implementations if it's not a replay.