zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 08:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Network messages will now show usernames instead of just numbers

Browse source 
Gives more useful feedback as it's not obvious which node belongs to who.

Added line breaks to network messages for cases where a large amount of players are desynced.
This commit is contained in:
Boondorl 2024-04-29 07:43:14 -04:00 committed by Ricardo Luís Vaz Silva
parent 4c191f4bf5
commit 3d6e508d67
4 changed files with 51 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/g_statusbar/shared_sbar.cpp
View file

@ -1233,76 +1233,63 @@ void DBaseStatusBar::DrawTopStuff (EHudState state)
void DBaseStatusBar::DrawConsistancy () const
{
static bool firsttime = true;
int i;
char conbuff[64], *buff_p;
if (!netgame)
return;
buff_p = NULL;
for (i = 0; i < MAXPLAYERS; i++)
bool desync = false;
FString text = "Out of sync with:";
for (int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].inconsistant)
{
if (buff_p == NULL)
{
strcpy (conbuff, "Out of sync with:");
buff_p = conbuff + 17;
}
*buff_p++ = ' ';
*buff_p++ = '1' + i;
*buff_p = 0;
desync = true;
text.AppendFormat(" %s (%d)", players[i].userinfo.GetName(10u), i + 1);
}
}
if (buff_p != NULL)
if (desync)
{
if (firsttime)
auto lines = V_BreakLines(SmallFont, twod->GetWidth() / CleanXfac - 40, text.GetChars());
const int height = SmallFont->GetHeight() * CleanYfac;
double y = 0.0;
for (auto& line : lines)
{
firsttime = false;
if (debugfile)
{
fprintf (debugfile, "%s as of tic %d (%d)\n", conbuff,
players[1-consoleplayer].inconsistant,
players[1-consoleplayer].inconsistant/ticdup);
}
DrawText(twod, SmallFont, CR_GREEN,
(twod->GetWidth() - SmallFont->StringWidth(line.Text) * CleanXfac) * 0.5,
y, line.Text.GetChars(), DTA_CleanNoMove, true, TAG_DONE);
y += height;
}
DrawText(twod, SmallFont, CR_GREEN,
(twod->GetWidth() - SmallFont->StringWidth (conbuff)*CleanXfac) / 2,
0, conbuff, DTA_CleanNoMove, true, TAG_DONE);
}
}
void DBaseStatusBar::DrawWaiting () const
{
int i;
char conbuff[64], *buff_p;
if (!netgame)
return;
buff_p = NULL;
for (i = 0; i < MAXPLAYERS; i++)
FString text = "Waiting for:";
bool isWaiting = false;
for (int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].waiting)
{
if (buff_p == NULL)
{
strcpy (conbuff, "Waiting for:");
buff_p = conbuff + 12;
}
*buff_p++ = ' ';
*buff_p++ = '1' + i;
*buff_p = 0;
isWaiting = true;
text.AppendFormat(" %s (%d)", players[i].userinfo.GetName(10u), i + 1);
}
}
if (buff_p != NULL)
if (isWaiting)
{
DrawText(twod, SmallFont, CR_ORANGE,
(twod->GetWidth() - SmallFont->StringWidth (conbuff)*CleanXfac) / 2,
SmallFont->GetHeight()*CleanYfac, conbuff, DTA_CleanNoMove, true, TAG_DONE);
auto lines = V_BreakLines(SmallFont, twod->GetWidth() / CleanXfac - 40, text.GetChars());
const int height = SmallFont->GetHeight() * CleanYfac;
double y = 0.0;
for (auto& line : lines)
{
DrawText(twod, SmallFont, CR_ORANGE,
(twod->GetWidth() - SmallFont->StringWidth(line.Text) * CleanXfac) * 0.5,
y, line.Text.GetChars(), DTA_CleanNoMove, true, TAG_DONE);
y += height;
}
}
}

20
src/playsim/d_player.h
View file

@ -204,9 +204,25 @@ struct userinfo_t : TMap<FName,FBaseCVar *>
{
return *static_cast<FFloatCVar *>(*CheckKey(NAME_Autoaim));
}
const char *GetName() const
const char *GetName(unsigned int charLimit = 0u) const
{
return *static_cast<FStringCVar *>(*CheckKey(NAME_Name));
const char* name = *static_cast<FStringCVar*>(*CheckKey(NAME_Name));
if (charLimit)
{
FString temp = name;
if (temp.CharacterCount() > charLimit)
{
int next = 0;
for (unsigned int i = 0u; i < charLimit; ++i)
temp.GetNextCharacter(next);
temp.Truncate(next);
temp += "...";
name = temp.GetChars();
}
}
return name;
}
int GetTeam() const
{

3
src/playsim/p_user.cpp
View file

@ -727,7 +727,8 @@ DEFINE_ACTION_FUNCTION(_PlayerInfo, Resurrect)
DEFINE_ACTION_FUNCTION(_PlayerInfo, GetUserName)
{
PARAM_SELF_STRUCT_PROLOGUE(player_t);
ACTION_RETURN_STRING(self->userinfo.GetName());
PARAM_UINT(charLimit);
ACTION_RETURN_STRING(self->userinfo.GetName(charLimit));
}
DEFINE_ACTION_FUNCTION(_PlayerInfo, GetNeverSwitch)

2
wadsrc/static/zscript/actors/player/player.zs
View file

@ -2861,7 +2861,7 @@ struct PlayerInfo native play // self is what internally is known as player_t
native void SetSubtitleNumber (int text, Sound sound_id = 0);
native bool Resurrect();
native clearscope String GetUserName() const;
native clearscope String GetUserName(uint charLimit = 0u) const;
native clearscope Color GetColor() const;
native clearscope Color GetDisplayColor() const;
native clearscope int GetColorSet() const;