diff -ur ScummVM-cvs20030605/scummvm/common/config-file.cpp ScummVM-cvs20030605+hack/scummvm/common/config-file.cpp
|
old
|
new
|
|
| 45 | 45 | // The config-class itself. |
| 46 | 46 | |
| 47 | 47 | Config::Config (const String &cfg, const String &d) |
| 48 | | : filename(cfg), defaultDomain(d), willwrite(false) { |
| | 48 | : filename(cfg), defaultDomain(d), willwrite(false), readonly(false) { |
| 49 | 49 | FILE *cfg_file; |
| 50 | 50 | char t[MAXLINELEN]; |
| 51 | 51 | |
| … |
… |
|
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | |
| | 221 | void Config::set_readonly(bool r) { |
| | 222 | readonly = r; |
| | 223 | } |
| | 224 | |
| 221 | 225 | void Config::set_writing(bool w) { |
| | 226 | if (readonly) |
| | 227 | w = false; |
| 222 | 228 | willwrite = w; |
| 223 | 229 | } |
| 224 | 230 | |
diff -ur ScummVM-cvs20030605/scummvm/common/config-file.h ScummVM-cvs20030605+hack/scummvm/common/config-file.h
|
old
|
new
|
|
| 51 | 51 | bool has_domain(const String &d) const; |
| 52 | 52 | void set_filename(const String &); |
| 53 | 53 | void merge_config(const Config &); |
| | 54 | void set_readonly(bool); |
| 54 | 55 | void set_writing(bool); |
| 55 | 56 | |
| 56 | 57 | const int count_domains(); |
| … |
… |
|
| 61 | 62 | String filename; |
| 62 | 63 | String defaultDomain; |
| 63 | 64 | |
| | 65 | bool readonly; |
| 64 | 66 | bool willwrite; |
| 65 | 67 | }; |
| 66 | 68 | |
diff -ur ScummVM-cvs20030605/scummvm/common/main.cpp ScummVM-cvs20030605+hack/scummvm/common/main.cpp
|
old
|
new
|
|
| 178 | 178 | |
| 179 | 179 | // Read the config file |
| 180 | 180 | g_config = new Config(scummhome, "scummvm"); |
| | 181 | g_config->set_readonly(g_config->getBool("read_only")); |
| 181 | 182 | g_config->set("versioninfo", SCUMMVM_VERSION); |
| 182 | 183 | |
| 183 | 184 | // Parse the command line information |