SHERLOCK: Silence very noisy GCC warning

Since 'w' and 'h' are members of ManagedSurface, using them as
input parameters to a method caused GCC to warn about them being
shadowed. For just about every file in the Sherlock engine...

engines/sherlock/surface.h

@@ -121,7 +121,7 @@ class Surface : public BaseSurface {
 	virtual void addDirtyRect(const Common::Rect &r) {}
 public:
 	Surface() : BaseSurface() {}
-	Surface(int w, int h) : BaseSurface(w, h) {}
+	Surface(int width, int height) : BaseSurface(width, height) {}
 };
 
 } // End of namespace Sherlock