diff options
Diffstat (limited to 'backends')
-rw-r--r-- | backends/platform/iphone/osys_main.cpp | 8 | ||||
-rw-r--r-- | backends/platform/iphone/osys_main.h | 4 | ||||
-rw-r--r-- | backends/platform/iphone/osys_video.cpp | 22 |
3 files changed, 17 insertions, 17 deletions
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index 5cf8913835..8064fe4445 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -53,8 +53,8 @@ SoundProc OSystem_IPHONE::s_soundCallback = NULL; void *OSystem_IPHONE::s_soundParam = NULL; OSystem_IPHONE::OSystem_IPHONE() : - _mixer(NULL), _offscreen(NULL), - _overlayVisible(false), _fullscreen(NULL), + _mixer(NULL), _gameScreenRaw(NULL), + _overlayVisible(false), _gameScreenConverted(NULL), _mouseHeight(0), _mouseWidth(0), _mouseBuf(NULL), _lastMouseTap(0), _queuedEventTime(0), _secondaryTapped(false), _lastSecondaryTap(0), _screenOrientation(kScreenOrientationFlippedLandscape), _mouseClickAndDragEnabled(false), @@ -70,8 +70,8 @@ OSystem_IPHONE::~OSystem_IPHONE() { AudioQueueDispose(s_AudioQueue.queue, true); delete _mixer; - delete _offscreen; - delete _fullscreen; + delete _gameScreenRaw; + delete _gameScreenConverted; } int OSystem_IPHONE::timerHandler(int t) { diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index dad2e9f676..6a779a8fde 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -63,12 +63,12 @@ protected: Audio::MixerImpl *_mixer; Graphics::Surface _framebuffer; - byte *_offscreen; + byte *_gameScreenRaw; OverlayColor *_overlayBuffer; uint16 _overlayHeight; uint16 _overlayWidth; - uint16 *_fullscreen; + uint16 *_gameScreenConverted; // For use with the game texture uint16 _gamePalette[256]; diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp index 2c9e5633a4..2b86c1d1de 100644 --- a/backends/platform/iphone/osys_video.cpp +++ b/backends/platform/iphone/osys_video.cpp @@ -52,10 +52,10 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm _screenWidth = width; _screenHeight = height; - free(_offscreen); + free(_gameScreenRaw); - _offscreen = (byte *)malloc(width * height); - bzero(_offscreen, width * height); + _gameScreenRaw = (byte *)malloc(width * height); + bzero(_gameScreenRaw, width * height); //free(_overlayBuffer); @@ -63,10 +63,10 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm //_overlayBuffer = (OverlayColor *)malloc(fullSize); clearOverlay(); - free(_fullscreen); + free(_gameScreenConverted); - _fullscreen = (uint16 *)malloc(fullSize); - bzero(_fullscreen, fullSize); + _gameScreenConverted = (uint16 *)malloc(fullSize); + bzero(_gameScreenConverted, fullSize); iPhone_initSurface(width, height); @@ -147,7 +147,7 @@ void OSystem_IPHONE::copyRectToScreen(const byte *buf, int pitch, int x, int y, } - byte *dst = _offscreen + y * _screenWidth + x; + byte *dst = _gameScreenRaw + y * _screenWidth + x; if (_screenWidth == pitch && pitch == w) memcpy(dst, buf, h * w); else { @@ -196,8 +196,8 @@ void OSystem_IPHONE::drawDirtyRect(const Common::Rect &dirtyRect) { int h = dirtyRect.bottom - dirtyRect.top; int w = dirtyRect.right - dirtyRect.left; - byte *src = &_offscreen[dirtyRect.top * _screenWidth + dirtyRect.left]; - uint16 *dst = &_fullscreen[dirtyRect.top * _screenWidth + dirtyRect.left]; + byte *src = &_gameScreenRaw[dirtyRect.top * _screenWidth + dirtyRect.left]; + uint16 *dst = &_gameScreenConverted[dirtyRect.top * _screenWidth + dirtyRect.left]; for (int y = h; y > 0; y--) { for (int x = w; x > 0; x--) *dst++ = _gamePalette[*src++]; @@ -222,13 +222,13 @@ void OSystem_IPHONE::drawDirtyOverlayRect(const Common::Rect &dirtyRect) { } void OSystem_IPHONE::updateHardwareSurfaceForRect(const Common::Rect &updatedRect) { - iPhone_updateScreenRect(_fullscreen, updatedRect.left, updatedRect.top, updatedRect.right, updatedRect.bottom); + iPhone_updateScreenRect(_gameScreenConverted, updatedRect.left, updatedRect.top, updatedRect.right, updatedRect.bottom); } Graphics::Surface *OSystem_IPHONE::lockScreen() { //printf("lockScreen()\n"); - _framebuffer.pixels = _offscreen; + _framebuffer.pixels = _gameScreenRaw; _framebuffer.w = _screenWidth; _framebuffer.h = _screenHeight; _framebuffer.pitch = _screenWidth; |