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

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

pull/8794/merge
rubidium42 2021-05-30 13:34:58 +02:00 committed by rubidium42
parent 849a10520c
commit ab9b937ab7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network_udp.cpp
View File

@ -415,15 +415,14 @@ void ClientNetworkUDPSocketHandler::Receive_SERVER_NEWGRFS(Packet *p, NetworkAdd
if (num_grfs > NETWORK_MAX_GRF_COUNT) return; if (num_grfs > NETWORK_MAX_GRF_COUNT) return;
for (i = 0; i < num_grfs; i++) { for (i = 0; i < num_grfs; i++) {
char name[NETWORK_GRF_NAME_LENGTH];
GRFIdentifier c; GRFIdentifier c;
DeserializeGRFIdentifier(p, &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 /* An empty name is not possible under normal circumstances
* and causes problems when showing the NewGRF list. */ * 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. /* 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 * If it exists and not resolved yet, then name of the fake GRF is

4
src/newgrf_text.cpp
View File

@ -539,10 +539,10 @@ void AddGRFTextToList(GRFTextWrapper &list, byte langid, uint32 grfid, bool allo
* @param list The list where the text should be added to. * @param list The list where the text should be added to.
* @param text_to_add The text to add to the list. * @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()); if (!list) list.reset(new GRFTextList());
AddGRFTextToList(*list, GRFLX_UNSPECIFIED, std::string(text_to_add)); AddGRFTextToList(*list, GRFLX_UNSPECIFIED, text_to_add);
} }
/** /**

2
src/newgrf_text.h
View File

@ -42,7 +42,7 @@ void SetCurrentGrfLangID(byte language_id);
std::string TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newlines, const std::string &str, StringControlCode byte80 = SCC_NEWGRF_PRINT_WORD_STRING_ID); 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(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, 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); bool CheckGrfLangID(byte lang_id, byte grf_version);