cpp/openttd-patchpack/source Changeset - r25621:b453557b6e79

Changeset - r25621:b453557b6e79

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium42 - 3 years ago 2021-05-30 11:34:58
rubidium@openttd.org

Codechange: [Network] Use std::string to get a NewGRF's name

3 files changed with 5 insertions and 6 deletions:

src/network/network_udp.cpp

src/newgrf_text.cpp

src/newgrf_text.h

0 comments (0 inline, 0 general)

src/network/network_udp.cpp

➞

Show inline comments

@@ @@ -415,15 +415,14 @@ void ClientNetworkUDPSocketHandler::Rece @@
 	if (num_grfs > NETWORK_MAX_GRF_COUNT) return;
 	for (i = 0; i < num_grfs; i++) {
 		char name[NETWORK_GRF_NAME_LENGTH];
 		GRFIdentifier c;
 		DeserializeGRFIdentifier(p, &c);
-		p->Recv_string(name, sizeof(name));
+		std::string name = p->Recv_string(NETWORK_GRF_NAME_LENGTH);
 		/* An empty name is not possible under normal circumstances
 		 * and causes problems when showing the NewGRF list. */
-		if (StrEmpty(name)) continue;
+		if (name.empty()) continue;
 		/* Try to find the GRFTextWrapper for the name of this GRF ID and MD5sum tuple.
 		 * If it exists and not resolved yet, then name of the fake GRF is

src/newgrf_text.cpp

➞

Show inline comments

@@ @@ -539,10 +539,10 @@ void AddGRFTextToList(GRFTextWrapper &li @@
  * @param list The list where the text should be added to.
  * @param text_to_add The text to add to the list.
  */
-void AddGRFTextToList(GRFTextWrapper &list, const char *text_to_add)
+void AddGRFTextToList(GRFTextWrapper &list, const std::string &text_to_add)
+{
 	if (!list) list.reset(new GRFTextList());
-	AddGRFTextToList(*list, GRFLX_UNSPECIFIED, std::string(text_to_add));
 	AddGRFTextToList(*list, GRFLX_UNSPECIFIED, text_to_add);
+}
 /**

src/newgrf_text.h

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ void SetCurrentGrfLangID(byte language_i @@
 std::string TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newlines, const std::string &str, StringControlCode byte80 = SCC_NEWGRF_PRINT_WORD_STRING_ID);
 void AddGRFTextToList(GRFTextList &list, byte langid, uint32 grfid, bool allow_newlines, const char *text_to_add);
 void AddGRFTextToList(GRFTextWrapper &list, byte langid, uint32 grfid, bool allow_newlines, const char *text_to_add);
-void AddGRFTextToList(GRFTextWrapper &list, const char *text_to_add);
+void AddGRFTextToList(GRFTextWrapper &list, const std::string &text_to_add);
 bool CheckGrfLangID(byte lang_id, byte grf_version);

0 comments (0 inline, 0 general)