[aquaria] Some more patches #2

[Ryan C. Gordon]

> For patch #3, i am not sure this doesn't break anything - concerned that
> SDLmain removed may break things on linux or mac. Can't test it, my
> Linux machine is b0rked atm, and the Mac VM still refuses to be a usable OS.
> So, anyone who can test this please post the results, thanks :)
> (Take care of applying the patches in the right order!)

I haven't tested this specific patch, but I can tell you that Linux 
doesn't need SDLmain, and Mac OS X absolutely does.

--ryan.