From 58f2d2575de59f88a9a6fd3152f895332e53ddd1 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Sun, 8 Jul 2012 22:38:08 +0200 Subject: WINTERMUTE: Rename VarName->varName in BViewport --- engines/wintermute/Base/BViewport.cpp | 4 ++-- engines/wintermute/Base/BViewport.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/wintermute/Base/BViewport.cpp b/engines/wintermute/Base/BViewport.cpp index 5ac5e375d9..8292f5e145 100644 --- a/engines/wintermute/Base/BViewport.cpp +++ b/engines/wintermute/Base/BViewport.cpp @@ -63,8 +63,8 @@ HRESULT CBViewport::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBViewport::setRect(int left, int top, int right, int bottom, bool NoCheck) { - if (!NoCheck) { +HRESULT CBViewport::setRect(int left, int top, int right, int bottom, bool noCheck) { + if (!noCheck) { left = MAX(left, 0); top = MAX(top, 0); right = MIN(right, Game->_renderer->_width); diff --git a/engines/wintermute/Base/BViewport.h b/engines/wintermute/Base/BViewport.h index 6be57b712d..0360cb9957 100644 --- a/engines/wintermute/Base/BViewport.h +++ b/engines/wintermute/Base/BViewport.h @@ -39,7 +39,7 @@ public: int getHeight(); int getWidth(); RECT *getRect(); - HRESULT setRect(int left, int top, int right, int bottom, bool NoCheck = false); + HRESULT setRect(int left, int top, int right, int bottom, bool noCheck = false); DECLARE_PERSISTENT(CBViewport, CBBase) int _offsetY; int _offsetX; -- cgit v1.2.3