dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r8844) -Revert partly (r8820, r8806): Change AppendToGRFConfigList to add the allocated GRFConfig to its list and not copy it.

Browse Source
This commit is contained in:
Darkvater
2007-02-22 16:16:44 +00:00
parent 6206a87bb9
commit 9cf01ff432
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/newgrf_config.cpp
View File

@@ -178,13 +178,13 @@ void AppendStaticGRFConfigs(GRFConfig **dst)
}
/** Appends an element to a list of GRFs
* @param dst the head of the list to add to
* @param el the element that is being added (as a copy) */
void AppendToGRFConfigList(GRFConfig **dst, const GRFConfig *el)
* @param dst the head of the list to add to */
void AppendToGRFConfigList(GRFConfig **dst, GRFConfig *el)
{
GRFConfig **tail = dst;
while (*tail != NULL) tail = &(*tail)->next;
CopyGRFConfigList(tail, el);
*tail = el;
RemoveDuplicatesFromGRFConfigList(*dst);
}
@@ -451,10 +451,9 @@ static const SaveLoad _grfconfig_desc[] = {
static void Save_NGRF(void)
{
GRFConfig *c;
int index = 0;
for (c = _grfconfig; c != NULL; c = c->next) {
for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) {
if (HASBIT(c->flags, GCF_STATIC)) continue;
SlSetArrayIndex(index++);
SlObject(c, _grfconfig_desc);
@@ -464,12 +463,11 @@ static void Save_NGRF(void)
static void Load_NGRF(void)
{
GRFConfig c;
memset(&c, 0, sizeof(GRFConfig));
ClearGRFConfigList(&_grfconfig);
while (SlIterateArray() != -1) {
SlObject(&c, _grfconfig_desc);
AppendToGRFConfigList(&_grfconfig, &c);
GRFConfig *c = CallocT<GRFConfig>(1);
SlObject(c, _grfconfig_desc);
AppendToGRFConfigList(&_grfconfig, c);
}
/* Append static NewGRF configuration */