OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom into gzdoom-update-4-12-1

Browse source
This commit is contained in:
Rachael Alexanderson 2024-04-21 11:05:59 -04:00
commit 112c6cbccf
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
90 changed files with 1227 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/d_netinfo.cpp
View file

@ -321,7 +321,7 @@ static void UpdateTeam (int pnum, int team, bool update)
if ((dmflags2 & DF2_NO_TEAM_SWITCH) && (alwaysapplydmflags || deathmatch) && TeamLibrary.IsValidTeam (info->GetTeam()))
{
Printf ("%s\n", GStrings("TXT_NO_TEAM_CHANGE"));
Printf ("%s\n", GStrings.GetString("TXT_NO_TEAM_CHANGE"));
return;
}
@ -339,12 +339,12 @@ static void UpdateTeam (int pnum, int team, bool update)
FString message;
if (TeamLibrary.IsValidTeam (team))
{
message = GStrings("TXT_JOINED_TEAM");
message = GStrings.GetString("TXT_JOINED_TEAM");
message.Substitute("%t", Teams[team].GetName());
}
else
{
message = GStrings("TXT_LONER");
message = GStrings.GetString("TXT_LONER");
}
message.Substitute("%s", info->GetName());
Printf("%s\n", message.GetChars());