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

SDL backend: Simplified openConfigFileForReading/openConfigFileForWriting impl; also init _fsFactory in constructor, as it is needed to load the config file

Browse source 
svn-id: r34100
This commit is contained in:
Max Horn 2008-08-22 11:45:29 +00:00
parent a237ba75bc
commit 79751b07ae
1 changed files with 17 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -170,21 +170,6 @@ void OSystem_SDL::initBackend() {
_timerID = SDL_AddTimer(10, &timer_handler, _timer);
}
if (_fsFactory == 0) {
#if defined(__amigaos4__)
_fsFactory = new AmigaOSFilesystemFactory();
#elif defined(UNIX)
_fsFactory = new POSIXFilesystemFactory();
#elif defined(WIN32)
_fsFactory = new WindowsFilesystemFactory();
#elif defined(__SYMBIAN32__)
// Do nothing since its handled by the Symbian SDL inheritance
#else
#error Unknown and unsupported backend in OSystem_SDL::getFilesystemFactory
#endif
}
// Invoke parent implementation of this method
OSystem::initBackend();
@ -229,6 +214,19 @@ OSystem_SDL::OSystem_SDL()
memset(&_mouseCurState, 0, sizeof(_mouseCurState));
_inited = false;
#if defined(__amigaos4__)
_fsFactory = new AmigaOSFilesystemFactory();
#elif defined(UNIX)
_fsFactory = new POSIXFilesystemFactory();
#elif defined(WIN32)
_fsFactory = new WindowsFilesystemFactory();
#elif defined(__SYMBIAN32__)
// Do nothing since its handled by the Symbian SDL inheritance
#else
#error Unknown and unsupported FS backend
#endif
}
OSystem_SDL::~OSystem_SDL() {
@ -345,23 +343,13 @@ static Common::String getDefaultConfigFileName() {
}
Common::SeekableReadStream *OSystem_SDL::openConfigFileForReading() {
Common::File *confFile = new Common::File();
assert(confFile);
if (!confFile->open(getDefaultConfigFileName())) {
delete confFile;
confFile = 0;
}
return confFile;
FilesystemNode file(getDefaultConfigFileName());
return file.openForReading();
}
Common::WriteStream *OSystem_SDL::openConfigFileForWriting() {
Common::DumpFile *confFile = new Common::DumpFile();
assert(confFile);
if (!confFile->open(getDefaultConfigFileName())) {
delete confFile;
confFile = 0;
}
return confFile;
FilesystemNode file(getDefaultConfigFileName());
return file.openForWriting();
}
void OSystem_SDL::setWindowCaption(const char *caption) {