mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Move initialization of group-type to CreateGroup function.

pull/11385/head
Peter Nelson 2023-10-10 19:26:00 +01:00 committed by Peter Nelson
parent 8bd06807e4
commit ec1cf96b62
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ini_load.cpp
View File

@ -48,16 +48,13 @@ void IniItem::SetValue(const std::string_view value)
* @param parent the file we belong to * @param parent the file we belong to
* @param name the name of the group * @param name the name of the group
*/ */
IniGroup::IniGroup(IniLoadFile *parent, const std::string &name) : next(nullptr), type(IGT_VARIABLES), item(nullptr) IniGroup::IniGroup(IniLoadFile *parent, const std::string &name, IniGroupType type) : next(nullptr), type(type), item(nullptr)
{ {
this->name = StrMakeValid(name); this->name = StrMakeValid(name);
this->last_item = &this->item; this->last_item = &this->item;
*parent->last_group = this; *parent->last_group = this;
parent->last_group = &this->next; parent->last_group = &this->next;
if (std::find(parent->list_group_names.begin(), parent->list_group_names.end(), name) != parent->list_group_names.end()) this->type = IGT_LIST;
if (std::find(parent->seq_group_names.begin(), parent->seq_group_names.end(), name) != parent->seq_group_names.end()) this->type = IGT_SEQUENCE;
} }
/** Free everything we loaded. */ /** Free everything we loaded. */
@ -195,7 +192,11 @@ IniGroup &IniLoadFile::GetOrCreateGroup(const std::string &name)
*/ */
IniGroup &IniLoadFile::CreateGroup(const std::string &name) IniGroup &IniLoadFile::CreateGroup(const std::string &name)
{ {
IniGroup *group = new IniGroup(this, name); IniGroupType type = IGT_VARIABLES;
if (std::find(this->list_group_names.begin(), this->list_group_names.end(), name) != this->list_group_names.end()) type = IGT_LIST;
if (std::find(this->seq_group_names.begin(), this->seq_group_names.end(), name) != this->seq_group_names.end()) type = IGT_SEQUENCE;
IniGroup *group = new IniGroup(this, name, type);
group->comment = "\n"; group->comment = "\n";
return *group; return *group;
} }

2
src/ini_type.h
View File

@ -41,7 +41,7 @@ struct IniGroup {
std::string name; ///< name of group std::string name; ///< name of group
std::string comment; ///< comment for group std::string comment; ///< comment for group
IniGroup(struct IniLoadFile *parent, const std::string &name); IniGroup(struct IniLoadFile *parent, const std::string &name, IniGroupType type);
~IniGroup(); ~IniGroup();
IniItem *GetItem(const std::string &name) const; IniItem *GetItem(const std::string &name) const;