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

SDL: Merge deinit() into OSystem_SDL destructor and overload fatalError

Browse source 
svn-id: r54526
This commit is contained in:
Max Horn 2010-11-28 15:44:34 +00:00
parent 1d818d940a
commit 8f37f6634c
5 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,33 @@ OSystem_SDL::OSystem_SDL()
}
OSystem_SDL::~OSystem_SDL() {
deinit();
SDL_ShowCursor(SDL_ENABLE);
delete _savefileManager;
_savefileManager = 0;
delete _graphicsManager;
_graphicsManager = 0;
delete _eventManager;
_eventManager = 0;
delete _eventSource;
_eventSource = 0;
delete _audiocdManager;
_audiocdManager = 0;
delete _mixerManager;
_mixerManager = 0;
delete _timerManager;
_timerManager = 0;
delete _mutexManager;
_mutexManager = 0;
#ifdef USE_OPENGL
delete[] _graphicsModes;
#endif
delete _logger;
_logger = 0;
SDL_Quit();
}
void OSystem_SDL::init() {
@ -200,36 +226,6 @@ void OSystem_SDL::initSDL() {
}
}
void OSystem_SDL::deinit() {
SDL_ShowCursor(SDL_ENABLE);
delete _savefileManager;
_savefileManager = 0;
delete _graphicsManager;
_graphicsManager = 0;
delete _eventManager;
_eventManager = 0;
delete _eventSource;
_eventSource = 0;
delete _audiocdManager;
_audiocdManager = 0;
delete _mixerManager;
_mixerManager = 0;
delete _timerManager;
_timerManager = 0;
delete _mutexManager;
_mutexManager = 0;
#ifdef USE_OPENGL
delete[] _graphicsModes;
#endif
delete _logger;
_logger = 0;
SDL_Quit();
}
void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
#ifdef DATA_PATH
@ -364,10 +360,16 @@ void OSystem_SDL::setWindowCaption(const char *caption) {
}
void OSystem_SDL::quit() {
deinit();
delete this;
exit(0);
}
void OSystem_SDL::fatalError() {
delete this;
exit(1);
}
void OSystem_SDL::logMessage(LogMessageType::Type type, const char *message) {
ModularBackend::logMessage(type, message);
if (_logger)