cpp/openttd-patchpack/source Changeset - r10008:8136401bfc11

Changeset - r10008:8136401bfc11

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-08-25 15:15:41
rubidium@openttd.org

(svn r14167) -Fix: items in some ini-groups got duplicated on save.

3 files changed with 10 insertions and 20 deletions:

src/ini.cpp

src/ini_type.h

src/settings.cpp

0 comments (0 inline, 0 general)

src/ini.cpp

➞

Show inline comments

@@ @@ -19,14 +19,6 @@ IniItem::IniItem(IniGroup *parent, const @@
 	parent->last_item = &this->next;
+}
 IniItem::IniItem(IniGroup *parent, const char *name, const char *value) : next(NULL), comment(NULL)
+{
 	this->name  = strdup(name);
 	this->value = strdup(value);
 	*parent->last_item = this;
 	parent->last_item = &this->next;
+}
 IniItem::~IniItem()
+{
 	free(this->name);
@@ @@ -36,6 +28,12 @@ IniItem::~IniItem() @@
 	delete this->next;
+}
 void IniItem::SetValue(const char *value)
+{
 	free(this->value);
 	this->value = strdup(value);
+}
 IniGroup::IniGroup(IniFile *parent, const char *name, size_t len) : next(NULL), type(IGT_VARIABLES), item(NULL), comment(NULL)
+{
 	if (len == 0) len = strlen(name);

src/ini_type.h

➞

Show inline comments

@@ @@ -26,14 +26,6 @@ struct IniItem { @@
 	 */
 	IniItem(struct IniGroup *parent, const char *name, size_t len = 0);
 	/**
 	 * Construct a new in-memory item of an Ini file.
 	 * @param parent the group we belong to
 	 * @param name   the name of the item
 	 * @param value  the value to immediatelly assign
 	 */
 	IniItem(IniGroup *parent, const char *name, const char *value);
 	/** Free everything we loaded. */
 	~IniItem();

src/settings.cpp

➞

Show inline comments

@@ @@ -640,7 +640,7 @@ static void ini_save_setting_list(IniFil @@
 		if (entry == NULL || *entry == '\0') continue;
-		new IniItem(group, entry, "");
+		group->GetItem(entry, true)->SetValue("");
+	}
+}
@@ @@ -1687,7 +1687,7 @@ static void NewsDisplaySaveConfig(IniFil @@
 		value = (v == ND_OFF ? "off" : (v == ND_SUMMARY ? "summarized" : "full"));
-		new IniItem(group, _news_type_data[i].name, value);
+		group->GetItem(_news_type_data[i].name, true)->SetValue(value);
+	}
+}
@@ @@ -1708,7 +1708,7 @@ static void SaveVersionInConfig(IniFile @@
 	};
 	for (uint i = 0; i < lengthof(versions); i++) {
-		new IniItem(group, versions[i][0], versions[i][1]);
+		group->GetItem(versions[i][0], true)->SetValue(versions[i][1]);
+	}
+}
@@ @@ -1722,7 +1722,7 @@ static void GRFSaveConfig(IniFile *ini, @@
 		char params[512];
 		GRFBuildParamList(params, c, lastof(params));
-		new IniItem(group, c->filename, params);
+		group->GetItem(c->filename, true)->SetValue(params);
+	}
+}

0 comments (0 inline, 0 general)