thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Cleanup.

Browse source 
svn-id: r53436
This commit is contained in:
Johannes Schickel 2010-10-13 15:43:08 +00:00
parent 34302765ca
commit 54f559dc51
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backends/platform/sdl/sdl.cpp
View file

@ -226,7 +226,7 @@ void OSystem_SDL::deinit() {
_mutexManager = 0; _mutexManager = 0;
#ifdef USE_OPENGL #ifdef USE_OPENGL
free((void *)_graphicsModes), delete[] _graphicsModes;
#endif #endif
SDL_Quit(); SDL_Quit();
@ -388,12 +388,12 @@ void OSystem_SDL::setupGraphicsModes() {
} }
srcMode = openglGraphicsModes; srcMode = openglGraphicsModes;
while (srcMode->name) { while (srcMode->name) {
_glModesCount ++; _glModesCount++;
srcMode++; srcMode++;
} }
// Allocate enough space for merged array of modes // Allocate enough space for merged array of modes
_graphicsModes = (OSystem::GraphicsMode *)malloc(sizeof(OSystem::GraphicsMode) * (_glModesCount + _sdlModesCount + 1)); _graphicsModes = new OSystem::GraphicsMode[_glModesCount + _sdlModesCount + 1];
// Copy SDL graphics modes // Copy SDL graphics modes
memcpy((void *)_graphicsModes, sdlGraphicsModes, _sdlModesCount * sizeof(OSystem::GraphicsMode)); memcpy((void *)_graphicsModes, sdlGraphicsModes, _sdlModesCount * sizeof(OSystem::GraphicsMode));
@ -406,7 +406,7 @@ void OSystem_SDL::setupGraphicsModes() {
// Set new internal ids for all modes // Set new internal ids for all modes
int i = 0; int i = 0;
OSystem::GraphicsMode * mode = _graphicsModes; OSystem::GraphicsMode *mode = _graphicsModes;
while (mode->name) { while (mode->name) {
mode->id = i++; mode->id = i++;
mode++; mode++;