SWORD25: Mass-eliminating of BS_ prefix in fmv/ and gfx/

svn-id: r53258

1 files changed, 12 insertions, 12 deletions

diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp
index a7065cc03d..cc8f813fe6 100644
--- a/engines/sword25/gfx/opengl/glimage.cpp
+++ b/engines/sword25/gfx/opengl/glimage.cpp
@@ -51,7 +51,7 @@ namespace Sword25 {
 // CONSTRUCTION / DESTRUCTION
 // -----------------------------------------------------------------------------
 
-BS_GLImage::BS_GLImage(const Common::String &Filename, bool &Result) :
+GLImage::GLImage(const Common::String &Filename, bool &Result) :
 	_data(0),
 	m_Width(0),
 	m_Height(0) {
@@ -60,7 +60,7 @@ BS_GLImage::BS_GLImage(const Common::String &Filename, bool &Result) :
 	BS_PackageManager *pPackage = static_cast<BS_PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
 	BS_ASSERT(pPackage);
 
-	_backSurface = (static_cast<BS_GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx")))->getSurface();
+	_backSurface = (static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx")))->getSurface();
 
 	// Datei laden
 	char *pFileData;
@@ -71,15 +71,15 @@ BS_GLImage::BS_GLImage(const Common::String &Filename, bool &Result) :
 	}
 
 	// Bildeigenschaften bestimmen
-	BS_GraphicEngine::COLOR_FORMATS ColorFormat;
+	GraphicEngine::COLOR_FORMATS ColorFormat;
 	int Pitch;
-	if (!BS_ImageLoader::ExtractImageProperties(pFileData, FileSize, ColorFormat, m_Width, m_Height)) {
+	if (!ImageLoader::ExtractImageProperties(pFileData, FileSize, ColorFormat, m_Width, m_Height)) {
 		BS_LOG_ERRORLN("Could not read image properties.");
 		return;
 	}
 
 	// Das Bild dekomprimieren
-	if (!BS_ImageLoader::LoadImage(pFileData, FileSize, BS_GraphicEngine::CF_ABGR32, _data, m_Width, m_Height, Pitch)) {
+	if (!ImageLoader::LoadImage(pFileData, FileSize, GraphicEngine::CF_ABGR32, _data, m_Width, m_Height, Pitch)) {
 		BS_LOG_ERRORLN("Could not decode image.");
 		return;
 	}
@@ -93,7 +93,7 @@ BS_GLImage::BS_GLImage(const Common::String &Filename, bool &Result) :
 
 // -----------------------------------------------------------------------------
 
-BS_GLImage::BS_GLImage(unsigned int Width, unsigned int Height, bool &Result) :
+GLImage::GLImage(unsigned int Width, unsigned int Height, bool &Result) :
 	m_Width(Width),
 	m_Height(Height) {
 	Result = false;
@@ -106,20 +106,20 @@ BS_GLImage::BS_GLImage(unsigned int Width, unsigned int Height, bool &Result) :
 
 // -----------------------------------------------------------------------------
 
-BS_GLImage::~BS_GLImage() {
+GLImage::~GLImage() {
 	delete[] _data;
 }
 
 // -----------------------------------------------------------------------------
 
-bool BS_GLImage::Fill(const BS_Rect *pFillRect, unsigned int Color) {
+bool GLImage::Fill(const BS_Rect *pFillRect, unsigned int Color) {
 	BS_LOG_ERRORLN("Fill() is not supported.");
 	return false;
 }
 
 // -----------------------------------------------------------------------------
 
-bool BS_GLImage::SetContent(const byte *Pixeldata, uint size, unsigned int Offset, unsigned int Stride) {
+bool GLImage::SetContent(const byte *Pixeldata, uint size, unsigned int Offset, unsigned int Stride) {
 	// Überprüfen, ob PixelData ausreichend viele Pixel enthält um ein Bild der Größe Width * Height zu erzeugen
 	if (size < static_cast<unsigned int>(m_Width * m_Height * 4)) {
 		BS_LOG_ERRORLN("PixelData vector is too small to define a 32 bit %dx%d image.", m_Width, m_Height);
@@ -140,14 +140,14 @@ bool BS_GLImage::SetContent(const byte *Pixeldata, uint size, unsigned int Offse
 
 // -----------------------------------------------------------------------------
 
-unsigned int BS_GLImage::GetPixel(int X, int Y) {
+unsigned int GLImage::GetPixel(int X, int Y) {
 	BS_LOG_ERRORLN("GetPixel() is not supported. Returning black.");
 	return 0;
 }
 
 // -----------------------------------------------------------------------------
 
-bool BS_GLImage::Blit(int PosX, int PosY, int Flipping, BS_Rect *pPartRect, unsigned int Color, int Width, int Height) {
+bool GLImage::Blit(int PosX, int PosY, int Flipping, BS_Rect *pPartRect, unsigned int Color, int Width, int Height) {
 	int x1 = 0, y1 = 0;
 	int w = m_Width, h = m_Height;
 	if (pPartRect) {
@@ -177,7 +177,7 @@ bool BS_GLImage::Blit(int PosX, int PosY, int Flipping, BS_Rect *pPartRect, unsi
 		warning("STUB: Sprite scaling (%f x %f)", ScaleX, ScaleY);
 	}
 
-	if (Flipping & (BS_Image::FLIP_V | BS_Image::FLIP_H)) {
+	if (Flipping & (Image::FLIP_V | Image::FLIP_H)) {
 		warning("STUB: Sprite flipping");
 	}