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

SDL: Split quit() method into deinit() so error codes could be returned.

Browse source 
svn-id: r49131
This commit is contained in:
Eugene Sandulenko 2010-05-21 18:22:11 +00:00
parent e7330aa0af
commit 01c55efc95
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/sdl/main.cpp
View file

@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
// Invoke the actual ScummVM main entry point:
int res = scummvm_main(argc, argv);
g_system->quit(); // TODO: Consider removing / replacing this!
((OSystem_SDL *)g_system)->deinit();
return res;
}

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

@ -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);

2
backends/platform/sdl/sdl.h
View file

@ -202,6 +202,8 @@ public:
// Quit
virtual void quit(); // overloaded by CE backend
void deinit();
virtual void getTimeAndDate(TimeDate &t) const;
virtual Common::TimerManager *getTimerManager();