From e7330aa0afec88c6d7327ac9fd1a49736daaad6f Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 21 May 2010 18:18:52 +0000 Subject: Fix spelling svn-id: r49130 --- backends/platform/sdl/sdl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/sdl/sdl.cpp') diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 6b23acfb8b..33a06629f8 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -521,7 +521,7 @@ void OSystem_SDL::quit() { SDL_Quit(); - // Even Manager requires save manager for storing + // Event Manager requires save manager for storing // recorded events delete getEventManager(); delete _savefile; -- cgit v1.2.3 From 01c55efc95b2510eca1842058ab878e1ebd5ed4e Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 21 May 2010 18:22:11 +0000 Subject: SDL: Split quit() method into deinit() so error codes could be returned. svn-id: r49131 --- backends/platform/sdl/sdl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'backends/platform/sdl/sdl.cpp') diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 33a06629f8..9fa43cb389 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -496,7 +496,7 @@ bool OSystem_SDL::getFeatureState(Feature f) { } } -void OSystem_SDL::quit() { +void OSystem_SDL::deinit() { if (_cdrom) { SDL_CDStop(_cdrom); SDL_CDClose(_cdrom); @@ -525,6 +525,10 @@ void OSystem_SDL::quit() { // recorded events delete getEventManager(); delete _savefile; +} + +void OSystem_SDL::quit() { + deinit(); #if !defined(SAMSUNGTV) exit(0); -- cgit v1.2.3 From 93867d567fd76f909bfbb64f8300d6841af584e2 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 1 Jun 2010 22:28:24 +0000 Subject: Inline palettes in SDL backend into class OSystem_SDL svn-id: r49383 --- backends/platform/sdl/sdl.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'backends/platform/sdl/sdl.cpp') diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 9fa43cb389..c947e32cd8 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -251,9 +251,9 @@ OSystem_SDL::OSystem_SDL() _screenIsLocked(false), _graphicsMutex(0), _transactionMode(kTransactionNone) { - // allocate palette storage - _currentPalette = (SDL_Color *)calloc(sizeof(SDL_Color), 256); - _cursorPalette = (SDL_Color *)calloc(sizeof(SDL_Color), 256); + // clear palette storage + memset(_currentPalette, 0, sizeof(_currentPalette)); + memset(_cursorPalette, 0, sizeof(_cursorPalette)); _mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0; @@ -282,8 +282,6 @@ OSystem_SDL::~OSystem_SDL() { closeMixer(); free(_dirtyChecksums); - free(_currentPalette); - free(_cursorPalette); free(_mouseData); delete _savefile; @@ -513,8 +511,6 @@ void OSystem_SDL::deinit() { closeMixer(); free(_dirtyChecksums); - free(_currentPalette); - free(_cursorPalette); free(_mouseData); delete _timer; -- cgit v1.2.3 From 767edc91faebdc1a60e5c8b3764b169dc9807ea5 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 2 Jun 2010 00:52:57 +0000 Subject: OSYSTEM: Get rid of kFeatureAutoComputeDirtyRects svn-id: r49388 --- backends/platform/sdl/sdl.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'backends/platform/sdl/sdl.cpp') diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index c947e32cd8..f8ae824acf 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -149,7 +149,6 @@ void OSystem_SDL::initBackend() { memset(&_videoMode, 0, sizeof(_videoMode)); memset(&_transactionDetails, 0, sizeof(_transactionDetails)); - _cksumValid = false; #if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && defined(USE_SCALERS) _videoMode.mode = GFX_DOUBLESIZE; _videoMode.scaleFactor = 2; @@ -163,7 +162,6 @@ void OSystem_SDL::initBackend() { _scalerProc = Normal1x; #endif _scalerType = 0; - _modeFlags = 0; #if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) _videoMode.fullscreen = ConfMan.getBool("fullscreen"); @@ -233,7 +231,7 @@ OSystem_SDL::OSystem_SDL() #endif _overlayVisible(false), _overlayscreen(0), _tmpscreen2(0), - _cdrom(0), _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _dirtyChecksums(0), + _cdrom(0), _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _scrollLock(false), _mouseVisible(false), _mouseNeedsRedraw(false), _mouseData(0), _mouseSurface(0), _mouseOrigSurface(0), _cursorTargetScale(1), _cursorPaletteDisabled(true), @@ -281,7 +279,6 @@ OSystem_SDL::~OSystem_SDL() { SDL_RemoveTimer(_timerID); closeMixer(); - free(_dirtyChecksums); free(_mouseData); delete _savefile; @@ -451,7 +448,6 @@ bool OSystem_SDL::hasFeature(Feature f) { return (f == kFeatureFullscreenMode) || (f == kFeatureAspectRatioCorrection) || - (f == kFeatureAutoComputeDirtyRects) || (f == kFeatureCursorHasPalette) || (f == kFeatureIconifyWindow); } @@ -464,12 +460,6 @@ void OSystem_SDL::setFeatureState(Feature f, bool enable) { case kFeatureAspectRatioCorrection: setAspectRatioCorrection(enable); break; - case kFeatureAutoComputeDirtyRects: - if (enable) - _modeFlags |= DF_WANT_RECT_OPTIM; - else - _modeFlags &= ~DF_WANT_RECT_OPTIM; - break; case kFeatureIconifyWindow: if (enable) SDL_WM_IconifyWindow(); @@ -487,8 +477,6 @@ bool OSystem_SDL::getFeatureState(Feature f) { return _videoMode.fullscreen; case kFeatureAspectRatioCorrection: return _videoMode.aspectRatioCorrection; - case kFeatureAutoComputeDirtyRects: - return _modeFlags & DF_WANT_RECT_OPTIM; default: return false; } @@ -510,7 +498,6 @@ void OSystem_SDL::deinit() { SDL_RemoveTimer(_timerID); closeMixer(); - free(_dirtyChecksums); free(_mouseData); delete _timer; -- cgit v1.2.3