cpp/openttd-patchpack/source Changeset - r25616:f6fb8fecc5a4

Changeset - r25616:f6fb8fecc5a4

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium42 - 3 years ago 2021-05-30 10:47:50
rubidium@openttd.org

Codechange: [ContentInfo] Use StringList for tags instead of custom allocations

5 files changed with 12 insertions and 15 deletions:

src/network/core/config.h

src/network/core/tcp_content.cpp

src/network/core/tcp_content_type.h

src/network/network_content.cpp

src/network/network_content_gui.cpp

0 comments (0 inline, 0 general)

src/network/core/config.h

➞

Show inline comments

@@ @@ -62,12 +62,13 @@ static const uint NETWORK_REVISION_LENGT @@
 static const uint NETWORK_PASSWORD_LENGTH         =   33;         ///< The maximum length of the password, in bytes including '\0' (must be >= NETWORK_SERVER_ID_LENGTH)
 static const uint NETWORK_CLIENTS_LENGTH          =  200;         ///< The maximum length for the list of clients that controls a company, in bytes including '\0'
 static const uint NETWORK_CLIENT_NAME_LENGTH      =   25;         ///< The maximum length of a client's name, in bytes including '\0'
 static const uint NETWORK_RCONCOMMAND_LENGTH      =  500;         ///< The maximum length of a rconsole command, in bytes including '\0'
 static const uint NETWORK_GAMESCRIPT_JSON_LENGTH  = COMPAT_MTU-3; ///< The maximum length of a gamescript json string, in bytes including '\0'. Must not be longer than COMPAT_MTU including header (3 bytes)
 static const uint NETWORK_CHAT_LENGTH             =  900;         ///< The maximum length of a chat message, in bytes including '\0'
 static const uint NETWORK_CONTENT_TAG_LENGTH      =   32;         ///< The maximum length of a content's tag, in bytes including '\0'.
 static const uint NETWORK_GRF_NAME_LENGTH         =   80;         ///< Maximum length of the name of a GRF
 /**
  * Maximum number of GRFs that can be sent.
  * This limit is reached when PACKET_UDP_SERVER_RESPONSE reaches the maximum size of UDP_MTU bytes.

src/network/core/tcp_content.cpp

➞

Show inline comments

@@ @@ -22,35 +22,33 @@ @@
 /** Clear everything in the struct */
 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),
-	tag_count(0), tags(nullptr), state((State)0), upgrade(false)
 	state((State)0), upgrade(false)
+{
+}
 /** Free everything allocated */
 ContentInfo::~ContentInfo()
+{
 	free(this->dependencies);
 	free(this->tags);
+}
 /**
  * Copy data from other #ContentInfo and take ownership of allocated stuff.
  * @param other Source to copy from. #dependencies and #tags will be NULLed.
  */
 void ContentInfo::TransferFrom(ContentInfo *other)
+{
 	if (other != this) {
 		free(this->dependencies);
 		free(this->tags);
 		*this = *other;
 		other->dependencies = nullptr;
-		other->tags = nullptr;
+		other->tags.clear();
+	}
+}
 /**
  * Is the state either selected or autoselected?
  * @return true iff that's the case

src/network/core/tcp_content_type.h

➞

Show inline comments

@@ @@ -66,14 +66,13 @@ struct ContentInfo { @@
 	char url[96];            ///< URL related to the content
 	char description[512];   ///< Description of the content
 	uint32 unique_id;        ///< Unique ID; either GRF ID or shortname
 	byte md5sum[16];         ///< The MD5 checksum
 	uint8 dependency_count;  ///< Number of dependencies
 	ContentID *dependencies; ///< Malloced array of dependencies (unique server side ids)
 	uint8 tag_count;         ///< Number of tags
 	char (*tags)[32];        ///< Malloced array of tags (strings)
 	StringList tags;         ///< Tags associated with the content
 	State state;             ///< Whether the content info is selected (for download)
 	bool upgrade;            ///< This item is an upgrade
 	ContentInfo();
 	~ContentInfo();

src/network/network_content.cpp

➞

Show inline comments

@@ @@ -67,15 +67,15 @@ bool ClientNetworkContentSocketHandler:: @@
+	}
 	ci->dependency_count = p->Recv_uint8();
 	ci->dependencies = MallocT<ContentID>(ci->dependency_count);
 	for (uint i = 0; i < ci->dependency_count; i++) ci->dependencies[i] = (ContentID)p->Recv_uint32();
 	ci->tag_count = p->Recv_uint8();
 	ci->tags = MallocT<char[32]>(ci->tag_count);
 	for (uint i = 0; i < ci->tag_count; i++) p->Recv_string(ci->tags[i], lengthof(*ci->tags));
 	uint tag_count = p->Recv_uint8();
 	ci->tags.reserve(tag_count);
 	for (uint i = 0; i < tag_count; i++) ci->tags.push_back(p->Recv_string(NETWORK_CONTENT_TAG_LENGTH));
 	if (!ci->IsValid()) {
 		delete ci;
 		this->CloseConnection();
 		return false;
+	}

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -440,15 +440,14 @@ class NetworkContentListWindow : public @@
+	}
 	/** Filter content by tags/name */
 	static bool CDECL TagNameFilter(const ContentInfo * const *a, ContentListFilterData &filter)
+	{
 		filter.string_filter.ResetState();
 		for (int i = 0; i < (*a)->tag_count; i++) {
 			filter.string_filter.AddLine((*a)->tags[i]);
+		}
 		for (auto &tag : (*a)->tags) filter.string_filter.AddLine(tag.c_str());
 		filter.string_filter.AddLine((*a)->name);
 		return filter.string_filter.GetState();
+	}
 	/** Filter content by type, but still show content selected for download. */
 	static bool CDECL TypeOrSelectedFilter(const ContentInfo * const *a, ContentListFilterData &filter)
@@ @@ -744,18 +743,18 @@ public: @@
+				}
+			}
 			SetDParamStr(0, buf);
 			y = DrawStringMultiLine(r.left + DETAIL_LEFT, r.right - DETAIL_RIGHT, y, max_y, STR_CONTENT_DETAIL_DEPENDENCIES);
+		}
-		if (this->selected->tag_count != 0) {
+		if (!this->selected->tags.empty()) {
 			/* List all tags */
 			char buf[DRAW_STRING_BUFFER] = "";
 			char *p = buf;
 			for (uint i = 0; i < this->selected->tag_count; i++) {
 				p += seprintf(p, lastof(buf), i == 0 ? "%s" : ", %s", this->selected->tags[i]);
 			for (auto &tag : this->selected->tags) {
 				p += seprintf(p, lastof(buf), p == buf ? "%s" : ", %s", tag.c_str());
+			}
 			SetDParamStr(0, buf);
 			y = DrawStringMultiLine(r.left + DETAIL_LEFT, r.right - DETAIL_RIGHT, y, max_y, STR_CONTENT_DETAIL_TAGS);
+		}
 		if (this->selected->IsSelected()) {

0 comments (0 inline, 0 general)