WINTERMUTE: Privatize/Protect variables that don't need to be public.

2 files changed, 16 insertions, 14 deletions

diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 32dced0878..84da8bd7f8 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -104,21 +104,23 @@ public:
 		return STATUS_OK;

 	};

 	bool pointInViewport(Point32 *P);

-	uint32 _forceAlphaColor;

-	uint32 _window;

-	uint32 _clipperWindow;

 	bool _active;

 	bool _ready;

 	bool _windowed;

-	Rect32 _windowRect;

-	Rect32 _viewportRect;

-	Rect32 _screenRect;

-	Rect32 _monitorRect;

 	int _bPP;

 	int _height;

 	int _width;

-	

+	uint32 _window;

+	uint32 _forceAlphaColor;

+

 	void addRectToList(BaseActiveRect *rect);

+protected:

+	uint32 _clipperWindow;

+

+	Rect32 _windowRect;

+	Rect32 _viewportRect;

+	Rect32 _screenRect;

+	Rect32 _monitorRect;

 private:

 	Common::Array<BaseActiveRect *> _rectList;

 };

diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index 9a72cbb236..cb98bde722 100644
--- a/engines/wintermute/base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -39,15 +39,9 @@ class BaseSurface: public BaseClass {
 public:

 	virtual bool invalidate();

 	virtual bool prepareToDraw();

-	bool _ckDefault;

-	byte _ckRed;

-	byte _ckGreen;

-	byte _ckBlue;

-

 	uint32 _lastUsedTime;

 	bool _valid;

 	int _lifeTime;

-	bool _keepLoaded;

 

 	bool _pixelOpReady;

 	BaseSurface(BaseGame *inGame);

@@ -88,6 +82,12 @@ public:
 	//void SetWidth(int Width){ _width = Width;    }

 	//void SetHeight(int Height){ _height = Height; }

 protected:

+	bool _ckDefault;

+	byte _ckRed;

+	byte _ckGreen;

+	byte _ckBlue;

+	

+	bool _keepLoaded;

 	Common::String _filename;

 	int _height;

 	int _width;