From e963f8bc6098c93b3b3d39d46fa7617a1567f6ef Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 29 May 2016 21:32:46 +0200
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 807fbeb1d1..401d9b648d 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -121,7 +121,7 @@ protected:
 	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
-- 
cgit v1.2.3