This was not at all pleasant to merge, and problems should be expected. ;) git-svn-id: https://svn.eduke32.com/eduke32@194 1a8010ca-5511-0410-912e-c29ae57300e0