[Scummvm-cvs-logs] CVS: scummvm config-file.cpp,1.8,1.9 config-file.h,1.2,1.3 gameDetector.cpp,1.64,1.65
Nicolas Noble
pixels at users.sourceforge.net
Sun May 12 15:00:01 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv1054
Modified Files:
config-file.cpp config-file.h gameDetector.cpp
Log Message:
Almost closing bug #555105 (waiting for confirmation...)
Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/config-file.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config-file.cpp 5 May 2002 18:10:28 -0000 1.8
+++ config-file.cpp 12 May 2002 21:59:03 -0000 1.9
@@ -155,7 +155,7 @@
// The config-class itself.
Config::Config(const char *cfg, const char *d)
- : filename(Scumm::Strdup(cfg)), domain(d ? Scumm::Strdup(d) : 0), hash(0), ndomains(0)
+ : filename(Scumm::Strdup(cfg)), domain(d ? Scumm::Strdup(d) : 0), hash(0), ndomains(0), willwrite(false)
{
FILE *cfg_file;
char t[MAXLINELEN];
@@ -302,6 +302,9 @@
{
FILE *cfg_file;
int i;
+
+ if (!willwrite)
+ return;
if (!(cfg_file = fopen(filename, "w"))) {
debug(1, "Unable to write configuration file: %s.\n", filename);
@@ -376,4 +379,8 @@
hash[ndomains - 1]->merge(c->hash[i]);
}
}
+}
+
+void Config::set_writing(bool w) {
+ willwrite = w;
}
Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/config-file.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config-file.h 28 Apr 2002 00:56:52 -0000 1.2
+++ config-file.h 12 May 2002 21:59:03 -0000 1.3
@@ -38,10 +38,12 @@
void delete_domain(const char *);
void change_filename(const char *);
void merge_config(const Config *);
+ void set_writing(bool);
private:
char * filename, * domain;
hashconfig ** hash;
int ndomains;
+ bool willwrite;
};
// The global config object
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- gameDetector.cpp 8 May 2002 09:43:00 -0000 1.64
+++ gameDetector.cpp 12 May 2002 21:59:03 -0000 1.65
@@ -230,6 +230,7 @@
exit(1);
case 'w':
_saveconfig = true;
+ scummcfg->set_writing(true);
HANDLE_OPT_OPTION();
if (option != NULL)
scummcfg->change_filename(option);
@@ -258,7 +259,7 @@
}
}
- if (_saveconfig)
+ if (_exe_name)
scummcfg->flush();
return;
More information about the Scummvm-git-logs
mailing list