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

DIRECTOR: Enforce game target as prefix to the saved files in FileIO

Browse source
This commit is contained in:
Eugene Sandulenko 2021-09-01 15:37:37 +02:00
parent b85daf6066
commit e29b80f8cc
No known key found for this signature in database
GPG key ID: 014D387312D34F08
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/director/director.h
View file

@ -194,6 +194,7 @@ public:
void setVersion(uint16 version); void setVersion(uint16 version);
Common::Platform getPlatform() const; Common::Platform getPlatform() const;
Common::Language getLanguage() const; Common::Language getLanguage() const;
Common::String getTargetName() { return _targetName; }
const char *getExtra(); const char *getExtra();
Common::String getEXEName() const; Common::String getEXEName() const;
StartMovie getStartMovie() const; StartMovie getStartMovie() const;

20
engines/director/lingo/xlibs/fileio.cpp
View file

@ -148,9 +148,13 @@ void FileIO::m_new(int nargs) {
Common::String option = d1.asString(); Common::String option = d1.asString();
Common::String filename = d2.asString(); Common::String filename = d2.asString();
Common::String prefix = g_director->getTargetName() + '-';
if (option.hasPrefix("?")) { if (option.hasPrefix("?")) {
option = option.substr(1); option = option.substr(1);
GUI::FileBrowserDialog browser(0, "txt", option.equalsIgnoreCase("write") ? GUI::kFBModeSave : GUI::kFBModeLoad); Common::String mask = prefix + "*.txt";
GUI::FileBrowserDialog browser(0, "txt", option.equalsIgnoreCase("write") ? GUI::kFBModeSave : GUI::kFBModeLoad, mask.c_str());
if (browser.runModal() <= 0) { if (browser.runModal() <= 0) {
g_lingo->push(Datum(kErrorFileNotFound)); g_lingo->push(Datum(kErrorFileNotFound));
return; return;
@ -160,6 +164,12 @@ void FileIO::m_new(int nargs) {
filename += ".txt"; filename += ".txt";
} }
// Enforce target to the created files so they do not mix up
if (!option.hasPrefix("?") || option.equalsIgnoreCase("write")) {
if (!filename.hasPrefixIgnoreCase(prefix))
filename = prefix + filename;
}
if (option.equalsIgnoreCase("read")) { if (option.equalsIgnoreCase("read")) {
me->_inFile = saves->openForLoading(filename); me->_inFile = saves->openForLoading(filename);
me->_inStream = me->_inFile; me->_inStream = me->_inFile;
@ -409,7 +419,13 @@ void FileIO::m_fileName(int nargs) {
FileObject *me = static_cast<FileObject *>(g_lingo->_currentMe.u.obj); FileObject *me = static_cast<FileObject *>(g_lingo->_currentMe.u.obj);
if (me->_filename) { if (me->_filename) {
g_lingo->push(Datum(*me->_filename)); Common::String prefix = g_director->getTargetName() + '-';
Common::String res = *me->_filename;
if (res.hasPrefix(prefix)) {
res = Common::String(&me->_filename->c_str()[prefix.size() + 1]);
}
g_lingo->push(Datum(res));
} else { } else {
warning("FileIO: No file open"); warning("FileIO: No file open");
g_lingo->push(Datum(kErrorFileNotOpen)); g_lingo->push(Datum(kErrorFileNotOpen));