TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use range_for for multi_message_feedback team_name

Browse source
This commit is contained in:
Kp 2016-01-26 03:45:06 +00:00
parent bad07b668e
commit c641a0404a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/main/multi.cpp
View file

@ -1204,7 +1204,6 @@ static void multi_message_feedback(void)
{
char *colon;
int found = 0;
int i;
char feedback_result[200];
if (!(!(colon = strstr(Network_message.data(), ": ")) || colon == Network_message.data() || colon - Network_message.data() > CALLSIGN_LEN))
@ -1217,15 +1216,15 @@ static void multi_message_feedback(void)
}
if (Game_mode & GM_TEAM)
{
for (i = 0; i < N_players; i++)
range_for (auto &i, Netgame.team_name)
{
if (!d_strnicmp(Netgame.team_name[i], Network_message.data(), colon - Network_message.data()))
if (!d_strnicmp(i, Network_message.data(), colon - Network_message.data()))
{
const char *comma = found ? ", " : "";
found++;
const char *newline = (!(found % 4)) ? "\n" : "";
size_t l = strlen(feedback_result);
snprintf(feedback_result + l, sizeof(feedback_result) - l, "%s%s%s '%s'", comma, newline, TXT_TEAM, static_cast<const char *>(Netgame.team_name[i]));
snprintf(feedback_result + l, sizeof(feedback_result) - l, "%s%s%s '%s'", comma, newline, TXT_TEAM, static_cast<const char *>(i));
}
}
}