Backport changes from CVS about raceintospace

[kiyote]

I'll see if I can get these backported.

[kiyote]

Okay, I have a Branch_Backport which has all of the CVS changes applied, to the best of my brain state. (My mind is mush after doing these - it may have value eyeballing these changes...)

I wasn't able to completely prettify the code, so if someone has a tool that will clean it up, please do so.

All of the CVS changes were applied serially to maintain the content, each with the original description attached.

I make no value judgement on the changes, I figure if the change wasn't structured or written well, that will be taken care of by future refactors.

[kiyote]

To be clear, I have all the changes listed by the link above, I have not manually trawled the repo to be sure.

[willglynn]

Thanks! I rebased your changes against the current master and committed them. It looks like they build, which is good enough for me at the moment 😃

[willglynn]

I just reformatted all the source files again. Please be sure to re-pull, since this makes it very likely to cause lots of conflicts.

[kiyote]

So, what area of functionality are you working on, mostly? You seem to spend a fair amount of time in the display area, should I concentrate more on the backend structures and logic?

[willglynn]

At the moment, I'm working on the whole astronaut recruiting thing -- getting it out of the roster file, putting it in STL containers, cleaning up the recruiting screen, and such. At the moment (and at the root of all that), I'm integrating a JSON parser.