Updated for sfml-2.1/2.0, broke 1.6 compatability.