renamed namespace ScummVM to Common

svn-id: r10544

7 files changed, 18 insertions, 18 deletions

diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 5f704f7be0..f681f019b7 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -179,7 +179,7 @@ protected:
 	int _numStates;
 	int _state;
 
-	ScummVM::Rect _hitRect;
+	Common::Rect _hitRect;
 
 public:
 	Sword2Widget(Sword2Dialog *parent, int states) :
@@ -234,7 +234,7 @@ public:
 		return _state;
 	}
 
-	virtual void paint(ScummVM::Rect *clipRect = NULL) {
+	virtual void paint(Common::Rect *clipRect = NULL) {
 		DrawSurface(&_sprites[_state], _surfaces[_state]._surface, clipRect);
 	}
 
@@ -574,7 +574,7 @@ public:
 			createSurfaceImages(3406, x, y);
 	}
 
-	virtual void paint(ScummVM::Rect *clipRect = NULL) {
+	virtual void paint(Common::Rect *clipRect = NULL) {
 		// This will redraw a bit more than is strictly necessary,
 		// but I doubt that will make any noticeable difference.
 
@@ -948,7 +948,7 @@ public:
 		return &_text[0];
 	}
 
-	virtual void paint(ScummVM::Rect *clipRect = NULL) {
+	virtual void paint(Common::Rect *clipRect = NULL) {
 		Sword2Widget::paint();
 
 		// HACK: The main dialog is responsible for drawing the text
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp
index 6821df34bd..3fa0d9193c 100644
--- a/sword2/driver/d_draw.cpp
+++ b/sword2/driver/d_draw.cpp
@@ -305,7 +305,7 @@ int32 PlaySmacker(char *filename, _movieTextObject *text[], uint8 *musicOut) {
 		SetNeedRedraw();
 
 		// HACK: Remove the instructions created above
-		ScummVM::Rect r;
+		Common::Rect r;
 
 		memset(lpBackBuffer, 0, screenWide * MENUDEEP);
 		r.left = r.top = 0;
diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h
index e226291dcf..fd00dc267d 100644
--- a/sword2/driver/driver96.h
+++ b/sword2/driver/driver96.h
@@ -377,7 +377,7 @@ extern int32 ReadKey(_keyboardEvent *ke);
 //-----------------------------------------------------------------------------
 extern int32 DrawSprite(_spriteInfo *s);
 extern int32 CreateSurface(_spriteInfo *s, uint8 **surface);
-extern void DrawSurface(_spriteInfo *s, uint8 *surface, ScummVM::Rect *clipRect = NULL);
+extern void DrawSurface(_spriteInfo *s, uint8 *surface, Common::Rect *clipRect = NULL);
 extern void DeleteSurface(uint8 *surface);
 extern int32 OpenLightMask(_spriteInfo *s);
 extern int32 CloseLightMask(void);
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index f0783eac6a..8495e7cfb7 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -43,7 +43,7 @@ static uint8 pocketStatus[2][RDMENU_MAXPOCKETS] = {
 
 static uint8 iconCount = 0;
 
-void ClearIconArea(int menu, int pocket, ScummVM::Rect *r) {
+void ClearIconArea(int menu, int pocket, Common::Rect *r) {
 	byte *dst;
 	int i;
 
@@ -74,7 +74,7 @@ int32 ProcessMenu(void) {
 	uint8 frameCount;
 	int32 curx, xoff;
 	int32 cury, yoff;
-	ScummVM::Rect r1, r2;
+	Common::Rect r1, r2;
 	int32 delta;
 	static int32 lastTime = 0;
 
@@ -254,7 +254,7 @@ int32 HideMenu(uint8 menu) {
  */
 
 int32 CloseMenuImmediately(void) {
-	ScummVM::Rect r;
+	Common::Rect r;
 	int i;
 
 	menuStatus[0] = RDMENU_HIDDEN;
@@ -284,7 +284,7 @@ int32 CloseMenuImmediately(void) {
  */
 
 int32 SetMenuIcon(uint8 menu, uint8 pocket, uint8 *icon) {
-	ScummVM::Rect r;
+	Common::Rect r;
 
 	debug(5, "stub SetMenuIcon( %d, %d )", menu, pocket);
 
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index 787dc2914a..17acf5735e 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -74,12 +74,12 @@ typedef struct {
 
 BlockSurface **blockSurfaces[MAXLAYERS] = { 0, 0, 0, 0, 0 };
 
-void UploadRect(ScummVM::Rect *r) {
+void UploadRect(Common::Rect *r) {
 	g_system->copy_rect(lpBackBuffer + r->top * screenWide + r->left,
 		screenWide, r->left, r->top, r->right - r->left, r->bottom - r->top);
 }
 
-void BlitBlockSurface(BlockSurface *s, ScummVM::Rect *r, ScummVM::Rect *clip_rect) {
+void BlitBlockSurface(BlockSurface *s, Common::Rect *r, Common::Rect *clip_rect) {
 	if (r->top > clip_rect->bottom || r->left > clip_rect->right || r->bottom <= clip_rect->top || r->right <= clip_rect->left)
 		return;
 
@@ -703,7 +703,7 @@ int32 SetLocationMetrics(uint16 w, uint16 h) {
 
 int32 RenderParallax(_parallax *p, int16 l) {
 	int16 x, y;
-	ScummVM::Rect r;
+	Common::Rect r;
 
 	if (locationWide == screenWide)
 		x = 0;
@@ -715,7 +715,7 @@ int32 RenderParallax(_parallax *p, int16 l) {
 	else
 		y = ((int32) ((p->h - (screenDeep - MENUDEEP * 2)) * scrolly) / (int32) (locationDeep - (screenDeep - MENUDEEP * 2)));
 
-	ScummVM::Rect clip_rect;
+	Common::Rect clip_rect;
 
 	// Leave enough space for the top and bottom menues
 
diff --git a/sword2/driver/render.h b/sword2/driver/render.h
index 5a0112159d..34dc8eae58 100644
--- a/sword2/driver/render.h
+++ b/sword2/driver/render.h
@@ -56,6 +56,6 @@ extern int16 locationDeep;
 void SquashImage(byte *dst, uint16 dstPitch, uint16 dstWidth, uint16 dstHeight, byte *src, uint16 srcPitch, uint16 srcWidth, uint16 srcHeight, byte *backbuf);
 void StretchImage(byte *dst, uint16 dstPitch, uint16 dstWidth, uint16 dstHeight, byte *src, uint16 srcPitch, uint16 srcWidth, uint16 srcHeight, byte *backbuf);
 
-void UploadRect(ScummVM::Rect *r);
+void UploadRect(Common::Rect *r);
 
 #endif
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index 64189ca167..cb2a6a38b1 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -295,8 +295,8 @@ int32 CreateSurface(_spriteInfo *s, uint8 **sprite) {
  * @param clipRect the clipping rectangle
  */
 
-void DrawSurface(_spriteInfo *s, uint8 *surface, ScummVM::Rect *clipRect) {
-	ScummVM::Rect rd, rs;
+void DrawSurface(_spriteInfo *s, uint8 *surface, Common::Rect *clipRect) {
+	Common::Rect rd, rs;
 	uint16 x, y, srcPitch;
 	uint8 *src, *dst;
 
@@ -398,7 +398,7 @@ int32 DrawSprite(_spriteInfo *s) {
 	uint16 srcPitch;
 	bool freeSprite = false;
 	bool clipped = false;
-	ScummVM::Rect rd, rs;
+	Common::Rect rd, rs;
 
 	// -----------------------------------------------------------------
 	// Decompression and mirroring