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

Codechange: [ContentInfo] Use a vector for dependencies instead of custom allocation

Browse Source
This commit is contained in:
rubidium42
2021-05-30 12:53:42 +02:00
committed by rubidium42
parent 9c424ab741
commit df181bb641
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/core/tcp_content.cpp
View File

@@ -24,7 +24,7 @@
ContentInfo::ContentInfo()
: /* Temporary... will be removed later in the PR. */
type((ContentType)0), id((ContentID)0), filesize(0), filename(""), name(""), version(""),
url(""), description(""), unique_id(0), md5sum(""), dependency_count(0), dependencies(nullptr),
url(""), description(""), unique_id(0), md5sum(""),
state((State)0), upgrade(false)
{
}
@@ -32,7 +32,6 @@ ContentInfo::ContentInfo()
/** Free everything allocated */
ContentInfo::~ContentInfo()
{
free(this->dependencies);
}
/**
@@ -42,9 +41,8 @@ ContentInfo::~ContentInfo()
void ContentInfo::TransferFrom(ContentInfo *other)
{
if (other != this) {
free(this->dependencies);
*this = *other;
other->dependencies = nullptr;
other->dependencies.clear();
other->tags.clear();
}
}