diff options
| author | Darkvater <darkvater@openttd.org> | 2006-03-17 08:01:54 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-03-17 08:01:54 +0000 |
| commit | 583a52bd6f3fd24fadb75571eeee6663c94d7025 (patch) | |
| tree | 435e2476979a7d39f84953c9118d9754ec479fd1 /settings.c | |
| parent | 27d7d42404f98afeaeb62aef31408200cdf6ae7c (diff) | |
| download | openttd-583a52bd6f3fd24fadb75571eeee6663c94d7025.tar.xz | |
(svn r3914) - Properly implement SDT(G)_CONDNULL macro's without special cases (add flag SLF_CONFIG_NO and empty string as name)
Diffstat (limited to 'settings.c')
| -rw-r--r-- | settings.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/settings.c b/settings.c index 943824f9d..e51eb440a 100644 --- a/settings.c +++ b/settings.c @@ -615,7 +615,6 @@ static void ini_load_settings(IniFile *ini, const SettingDesc *sd, const char *g const SaveLoad *sld = &sd->save; if (!SlIsObjectCurrentlyValid(sld->version_from, sld->version_to)) continue; - if (sd->desc.name == NULL) continue; // XXX - wtf is this?? (group override?) s = strchr(sdb->name, '.'); @@ -683,7 +682,6 @@ static void ini_save_settings(IniFile *ini, const SettingDesc *sd, const char *g * file, just continue with the next setting */ if (!SlIsObjectCurrentlyValid(sld->version_from, sld->version_to)) continue; if (sld->conv & SLF_CONFIG_NO) continue; - if (sd->desc.name == NULL) continue; // XXX - wtf is this?? (group override?) s = strchr(sdb->name, '.'); @@ -882,7 +880,7 @@ static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list SDTG_CONDMMANY(name, type, flags, guiflags, var, def, full, str, proc, 0, SL_MAX_VERSION) #define SDTG_CONDNULL(length, from, to)\ - {{NULL, NULL, 0, 0, 0, 0, NULL, STR_NULL, NULL}, SLEG_CONDNULL(length, from, to)} + {{"", NULL, 0, 0, 0, 0, NULL, STR_NULL, NULL}, SLEG_CONDNULL(length, from, to)} #define SDTG_END() {{NULL, NULL, 0, 0, 0, 0, NULL, STR_NULL, NULL}, SLEG_END()} @@ -931,7 +929,7 @@ static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list SDT_CONDMMANY(base, var, type, 0, SL_MAX_VERSION, flags, guiflags, def, full, str, proc) #define SDT_CONDNULL(length, from, to)\ - {{NULL, NULL, 0, 0, 0, 0, NULL, STR_NULL, NULL}, SLE_CONDNULL(length, from, to)} + {{"", NULL, 0, 0, 0, 0, NULL, STR_NULL, NULL}, SLE_CONDNULL(length, from, to)} #define SDT_END() {{NULL, NULL, 0, 0, 0, 0, NULL, STR_NULL, NULL}, SLE_END()} |