IPHONE: Move some global variables to iPhoneView.

scummvm · Feb 24, 2012 · d93e155 · d93e155
1 parent 5863f6a
commit d93e155
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h
@@ -49,11 +49,18 @@
 
 	UIDeviceOrientation _orientation;
 
+	GLint _renderBufferWidth;
+	GLint _renderBufferHeight;
+
 	GLfloat _gameScreenVertCoords[4 * 2];
 	GLfloat _gameScreenTexCoords[4 * 2];
+	CGRect _gameScreenRect;
 
 	GLfloat _overlayVertCoords[4 * 2];
 	GLfloat _overlayTexCoords[4 * 2];
+	CGRect _overlayRect;
+
+	int _scaledShakeOffsetY;
 }
 
 - (id)initWithFrame:(struct CGRect)frame;

diff --git a/backends/platform/iphone/iphone_video.mm b/backends/platform/iphone/iphone_video.mm
@@ -30,20 +30,12 @@
 iPhoneView *g_iPhoneViewInstance = nil;
 static int _fullWidth;
 static int _fullHeight;
-static CGRect _gameScreenRect;
-
-static CGRect _overlayRect;
 
 static int _needsScreenUpdate = 0;
 
 static UITouch *_firstTouch = NULL;
 static UITouch *_secondTouch = NULL;
 
-static GLint _renderBufferWidth;
-static GLint _renderBufferHeight;
-
-static int _scaledShakeOffsetY;
-
 #if 0
 static long lastTick = 0;
 static int frames = 0;
@@ -203,6 +195,8 @@ - (id)initWithFrame:(struct CGRect)frame {
 	_overlayTexture = 0;
 	_mouseCursorTexture = 0;
 
+	_scaledShakeOffsetY = 0;
+
 	_gameScreenVertCoords[0] = _gameScreenVertCoords[1] =
 	    _gameScreenVertCoords[2] = _gameScreenVertCoords[3] =
 	    _gameScreenVertCoords[4] = _gameScreenVertCoords[5] =