ALL: sync with scummvm
This commit is contained in:
parent
0c962164d4
commit
7329a5d164
126 changed files with 2443 additions and 1679 deletions
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
|
||||
#define FORBIDDEN_SYMBOL_ALLOW_ALL
|
||||
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
|
@ -160,6 +160,8 @@ void OSystem_SDL::initBackend() {
|
|||
setupIcon();
|
||||
|
||||
_inited = true;
|
||||
|
||||
ModularBackend::initBackend();
|
||||
}
|
||||
|
||||
void OSystem_SDL::initSDL() {
|
||||
|
@ -198,20 +200,6 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
|
|||
|
||||
}
|
||||
|
||||
Common::String OSystem_SDL::getDefaultConfigFileName() {
|
||||
return "residual.ini";
|
||||
}
|
||||
|
||||
Common::SeekableReadStream *OSystem_SDL::createConfigReadStream() {
|
||||
Common::FSNode file(getDefaultConfigFileName());
|
||||
return file.createReadStream();
|
||||
}
|
||||
|
||||
Common::WriteStream *OSystem_SDL::createConfigWriteStream() {
|
||||
Common::FSNode file(getDefaultConfigFileName());
|
||||
return file.createWriteStream();
|
||||
}
|
||||
|
||||
void OSystem_SDL::setWindowCaption(const char *caption) {
|
||||
Common::String cap;
|
||||
byte c;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue