SWORD25: Refactored engine to remove BS_Rect class

svn-id: r53265

7 files changed, 12 insertions, 12 deletions

diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp
index a690cc19ee..919721df18 100644
--- a/engines/sword25/gfx/opengl/glimage.cpp
+++ b/engines/sword25/gfx/opengl/glimage.cpp
@@ -112,7 +112,7 @@ GLImage::~GLImage() {
 
 // -----------------------------------------------------------------------------
 
-bool GLImage::Fill(const BS_Rect *pFillRect, unsigned int Color) {
+bool GLImage::Fill(const Common::Rect *pFillRect, unsigned int Color) {
 	BS_LOG_ERRORLN("Fill() is not supported.");
 	return false;
 }
@@ -147,7 +147,7 @@ unsigned int GLImage::GetPixel(int X, int Y) {
 
 // -----------------------------------------------------------------------------
 
-bool 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, Common::Rect *pPartRect, unsigned int Color, int Width, int Height) {
 	int x1 = 0, y1 = 0;
 	int w = m_Width, h = m_Height;
 	if (pPartRect) {
diff --git a/engines/sword25/gfx/opengl/glimage.h b/engines/sword25/gfx/opengl/glimage.h
index 13276798e0..661c4cf1e7 100644
--- a/engines/sword25/gfx/opengl/glimage.h
+++ b/engines/sword25/gfx/opengl/glimage.h
@@ -82,10 +82,10 @@ public:
 
 	virtual bool Blit(int PosX = 0, int PosY = 0,
 	                  int Flipping = Image::FLIP_NONE,
-	                  BS_Rect *pPartRect = NULL,
+	                  Common::Rect *pPartRect = NULL,
 	                  unsigned int Color = BS_ARGB(255, 255, 255, 255),
 	                  int Width = -1, int Height = -1);
-	virtual bool Fill(const BS_Rect *pFillRect, unsigned int Color);
+	virtual bool Fill(const Common::Rect *pFillRect, unsigned int Color);
 	virtual bool SetContent(const byte *Pixeldata, uint size, unsigned int Offset = 0, unsigned int Stride = 0);
 	virtual unsigned int GetPixel(int X, int Y);
 
diff --git a/engines/sword25/gfx/opengl/glvectorimageblit.cpp b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
index 7dc6dd661d..8a91a910a2 100644
--- a/engines/sword25/gfx/opengl/glvectorimageblit.cpp
+++ b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
@@ -53,7 +53,7 @@ const float LINE_SCALE_FACTOR = 1.0f;
 
 bool VectorImage::Blit(int PosX, int PosY,
                           int Flipping,
-                          BS_Rect *pPartRect,
+                          Common::Rect *pPartRect,
                           unsigned int Color,
                           int Width, int Height) {
 #if 0
diff --git a/engines/sword25/gfx/opengl/openglgfx.cpp b/engines/sword25/gfx/opengl/openglgfx.cpp
index e73654ce95..bc2e228030 100644
--- a/engines/sword25/gfx/opengl/openglgfx.cpp
+++ b/engines/sword25/gfx/opengl/openglgfx.cpp
@@ -212,8 +212,8 @@ bool OpenGLGfx::GetVsync() const {
 
 // -----------------------------------------------------------------------------
 
-bool OpenGLGfx::Fill(const BS_Rect *FillRectPtr, unsigned int Color) {
-	BS_Rect Rect;
+bool OpenGLGfx::Fill(const Common::Rect *FillRectPtr, unsigned int Color) {
+	Common::Rect Rect;
 
 	if (!FillRectPtr) {
 		Rect.left = 0;
diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h
index 6615c540df..12c91f7d14 100644
--- a/engines/sword25/gfx/opengl/openglgfx.h
+++ b/engines/sword25/gfx/opengl/openglgfx.h
@@ -77,7 +77,7 @@ public:
 	virtual void        SetVsync(bool Vsync);
 	virtual bool        GetVsync() const;
 
-	virtual bool        Fill(const BS_Rect *FillRectPtr = 0, unsigned int Color = BS_RGB(0, 0, 0));
+	virtual bool        Fill(const Common::Rect *FillRectPtr = 0, unsigned int Color = BS_RGB(0, 0, 0));
 	virtual bool        GetScreenshot(unsigned int &Width, unsigned int &Height, byte **Data);
 
 	// Resource-Managing Methoden
diff --git a/engines/sword25/gfx/opengl/swimage.cpp b/engines/sword25/gfx/opengl/swimage.cpp
index 5fa579365b..4dd8d9fca3 100644
--- a/engines/sword25/gfx/opengl/swimage.cpp
+++ b/engines/sword25/gfx/opengl/swimage.cpp
@@ -102,7 +102,7 @@ SWImage::~SWImage() {
 
 bool SWImage::Blit(int PosX, int PosY,
                       int Flipping,
-                      BS_Rect *pPartRect,
+                      Common::Rect *pPartRect,
                       unsigned int Color,
                       int Width, int Height) {
 	BS_LOG_ERRORLN("Blit() is not supported.");
@@ -111,7 +111,7 @@ bool SWImage::Blit(int PosX, int PosY,
 
 // -----------------------------------------------------------------------------
 
-bool SWImage::Fill(const BS_Rect *pFillRect, unsigned int Color) {
+bool SWImage::Fill(const Common::Rect *pFillRect, unsigned int Color) {
 	BS_LOG_ERRORLN("Fill() is not supported.");
 	return false;
 }
diff --git a/engines/sword25/gfx/opengl/swimage.h b/engines/sword25/gfx/opengl/swimage.h
index d563125d26..0d0d1c75c3 100644
--- a/engines/sword25/gfx/opengl/swimage.h
+++ b/engines/sword25/gfx/opengl/swimage.h
@@ -67,10 +67,10 @@ public:
 
 	virtual bool Blit(int PosX = 0, int PosY = 0,
 	                  int Flipping = Image::FLIP_NONE,
-	                  BS_Rect *pPartRect = NULL,
+	                  Common::Rect *pPartRect = NULL,
 	                  unsigned int Color = BS_ARGB(255, 255, 255, 255),
 	                  int Width = -1, int Height = -1);
-	virtual bool Fill(const BS_Rect *FillRectPtr, unsigned int Color);
+	virtual bool Fill(const Common::Rect *FillRectPtr, unsigned int Color);
 	virtual bool SetContent(const byte *Pixeldata, uint size, unsigned int Offset, unsigned int Stride);
 	virtual unsigned int GetPixel(int X, int Y);