From 9febcd5ef8ac128e3d6583b231865bd1df9bbd8a Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 20 Apr 2006 22:09:49 +0000 Subject: [PATCH] (svn r4491) - Codechange: handle IGT_LIST types just as the other types with a proper name and value setting (for example for newgrf parameters). --- settings.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/settings.c b/settings.c index b5aec98188..5dbc11fbf3 100644 --- a/settings.c +++ b/settings.c @@ -233,12 +233,6 @@ static IniFile *ini_load(const char *filename) comment_size = 0; } - // for list items, the name and value are the same: - if (group->type == IGT_LIST) { - item->value = item->name; - continue; - } - // find start of parameter while (*t == '=' || *t == ' ' || *t == '\t') t++; @@ -315,11 +309,14 @@ static bool ini_save(const char *filename, IniFile *ini) if (group->comment) fputs(group->comment, f); fprintf(f, "[%s]\n", group->name); for (item = group->item; item != NULL; item = item->next) { - if (item->comment) fputs(item->comment, f); - if (group->type == IGT_LIST) - fprintf(f, "%s\n", item->value ? item->value : ""); - else - fprintf(f, "%s = %s\n", item->name, item->value ? item->value : ""); + assert(item->value != NULL); + if (item->comment != NULL) fputs(item->comment, f); + + //*Don't give an equal sign to list items that don't have a parameter */ + if (group->type == IGT_LIST && *item->value == '\0') { + fprintf(f, "%s\n", item->name); + } else + fprintf(f, "%s = %s\n", item->name, item->value); } } if (ini->comment) fputs(ini->comment, f);