diff options
| author | Max Horn | 2010-06-01 22:28:24 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-01 22:28:24 +0000 |
| commit | 93867d567fd76f909bfbb64f8300d6841af584e2 (patch) | |
| tree | a10166629799af3c26cff5dca34a6499f5af0db2 /backends/platform | |
| parent | a6efbf8880d56680e5503bcf1f68fdf2c9ef9156 (diff) | |
| download | scummvm-rg350-93867d567fd76f909bfbb64f8300d6841af584e2.tar.gz scummvm-rg350-93867d567fd76f909bfbb64f8300d6841af584e2.tar.bz2 scummvm-rg350-93867d567fd76f909bfbb64f8300d6841af584e2.zip | |
Inline palettes in SDL backend into class OSystem_SDL
svn-id: r49383
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 10 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 4 |
2 files changed, 5 insertions, 9 deletions
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; diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index c850ec5ab1..bfaabab80a 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -422,11 +422,11 @@ protected: int _newShakePos; // Palette data - SDL_Color *_currentPalette; + SDL_Color _currentPalette[256]; uint _paletteDirtyStart, _paletteDirtyEnd; // Cursor palette data - SDL_Color *_cursorPalette; + SDL_Color _cursorPalette[256]; /** * Mutex which prevents multiple threads from interfering with each other |