Updated some code to SDL2.
Merge branch 'master' of https://github.com/Paul-Wortmann/Frost_and_Flame