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

BACKENDS: All backends use _savefileManager now, adapt OSystem accordingly

Browse source
This commit is contained in:
Max Horn 2011-06-07 13:06:21 +02:00
parent 98db614cd8
commit 997f0a1900
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/system.cpp
View file

@ -77,8 +77,16 @@ void OSystem::initBackend() {
error("Backend failed to instantiate event manager"); error("Backend failed to instantiate event manager");
if (!_timerManager) if (!_timerManager)
error("Backend failed to instantiate timer manager"); error("Backend failed to instantiate timer manager");
// TODO: We currently don't check _savefileManager, because at least
// on the Nintendo DS, it is possible that none is set. That should
// probably be treated as "saving is not possible". Or else the NDS
// port needs to be changed to always set a _savefileManager
// if (!_savefileManager) // if (!_savefileManager)
// error("Backend failed to instantiate savefile manager"); // error("Backend failed to instantiate savefile manager");
// TODO: We currently don't check _fsFactory because not all ports
// set it.
// if (!_fsFactory) // if (!_fsFactory)
// error("Backend failed to instantiate fs factory"); // error("Backend failed to instantiate fs factory");
} }
@ -109,11 +117,6 @@ void OSystem::fatalError() {
exit(1); exit(1);
} }
Common::SaveFileManager *OSystem::getSavefileManager() {
assert(_savefileManager);
return _savefileManager;
}
FilesystemFactory *OSystem::getFilesystemFactory() { FilesystemFactory *OSystem::getFilesystemFactory() {
assert(_fsFactory); assert(_fsFactory);
return _fsFactory; return _fsFactory;

4
common/system.h
View file

@ -1042,7 +1042,9 @@ public:
* and other modifiable persistent game data. For more information, * and other modifiable persistent game data. For more information,
* refer to the SaveFileManager documentation. * refer to the SaveFileManager documentation.
*/ */
virtual Common::SaveFileManager *getSavefileManager(); inline Common::SaveFileManager *getSavefileManager() {
return _savefileManager;
}
/** /**
* Returns the FilesystemFactory object, depending on the current architecture. * Returns the FilesystemFactory object, depending on the current architecture.