[Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.22,1.23

Max Horn fingolfin at users.sourceforge.net
Thu Oct 2 10:44:01 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv18298/bs2

Modified Files:
	controls.cpp 
Log Message:
renamed namespace ScummVM to Common

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- controls.cpp	1 Oct 2003 06:36:24 -0000	1.22
+++ controls.cpp	2 Oct 2003 17:43:00 -0000	1.23
@@ -179,7 +179,7 @@
 	int _numStates;
 	int _state;
 
-	ScummVM::Rect _hitRect;
+	Common::Rect _hitRect;
 
 public:
 	Sword2Widget(Sword2Dialog *parent, int states) :
@@ -234,7 +234,7 @@
 		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 @@
 			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 @@
 		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





More information about the Scummvm-git-logs mailing list