Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp

src/blitter/base.hpp

@@ -33,10 +33,10 @@ enum BlitterMode {
  *  - heavy branching (remap lookups and animation buffer handling).
  */
 enum BlitterSpriteFlags {
-	SF_NONE        = 0,
-	SF_TRANSLUCENT = 1 << 1, ///< The sprite has at least 1 translucent pixel.
-	SF_NO_REMAP    = 1 << 2, ///< The sprite has no remappable colour pixel.
-	SF_NO_ANIM     = 1 << 3, ///< The sprite has no palette animated pixel.
+	BSF_NONE        = 0,
+	BSF_TRANSLUCENT = 1 << 1, ///< The sprite has at least 1 translucent pixel.
+	BSF_NO_REMAP    = 1 << 2, ///< The sprite has no remappable colour pixel.
+	BSF_NO_ANIM     = 1 << 3, ///< The sprite has no palette animated pixel.
 };
 DECLARE_ENUM_AS_BIT_SET(BlitterSpriteFlags);