Skip to content

CLIENT: Support for up to 8 players in HUD #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ToasterPanic wants to merge 4 commits into
base: main
Choose a base branch
from
Open

CLIENT: Support for up to 8 players in HUD #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c196eca
Allow up to 8 players client-side:
ToasterPanic Feb 8, 2025
fac0294
Increase limits for players in a few spots o scripts to 8
ToasterPanic Feb 8, 2025
56f5cf2
Sorta kinda fix a big where revive icons appear on the wrong players,…
ToasterPanic Feb 8, 2025
0de83c8
Add a check that should have been there already
ToasterPanic Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/client/defs/custom.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var struct revive_s {
float draw;
float timer;
float state;
} revive_icons[4]; // MAX_CLIENTS
} revive_icons[8]; // MAX_CLIENTS

float weaponframetime;
float weapon2frametime;
Expand Down
18 changes: 11 additions & 7 deletions source/client/hud.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void() HUD_Points =
float backwidth = 0.8*g_width;
vector TEXTCOLOR = '0 0 0';

for (int i = 3; i >= 0; i = i - 1)
for (int i = 7; i >= 0; i = i - 1)
{
float player_number = getplayerkeyfloat(i, "client_index");
entity client = findfloat(world, playernum, player_number);
Expand Down Expand Up @@ -1654,7 +1654,7 @@ void() HUD_Scores =
Draw_String([g_width/2 + (header_x_pos - getTextWidth("Headshots", scoreboard_text_size)/2), 180], "Headshots", [scoreboard_text_size, scoreboard_text_size], TEXTCOLOR, 1, 0);
header_x_pos += header_x_increment;

for (int i = 0; i < 4; i = i + 1)
for (int i = 0; i < 8; i = i + 1)
{
float player_number = getplayerkeyfloat(i, "client_index");
entity client = findfloat(world, playernum, player_number);
Expand Down Expand Up @@ -1994,7 +1994,7 @@ void() HUD_Spectator =

void() HUD_PlayerNames =
{
for (float i = 3; i >= 0; i = i - 1) {
for (float i = 7; i >= 0; i = i - 1) {
float player_number = getplayerkeyfloat(i, "client_index");

if (player_number == getstatf(STAT_PLAYERNUM))
Expand Down Expand Up @@ -2027,6 +2027,10 @@ void() HUD_PlayerNames =
case 1: text_color = TEXT_LIGHTBLUE; break;
case 2: text_color = TEXT_ORANGE; break;
case 3: text_color = TEXT_GREEN; break;
case 4: break;
case 5: text_color = TEXT_RED; break;
case 6: text_color = TEXT_YELLOW; break;
case 7: text_color = TEXT_PURPLE; break;
default: break;
}

Expand All @@ -2038,11 +2042,13 @@ void() HUD_PlayerNames =

void() HUD_ReviveIcons =
{
for (float i = 3; i >= 0; i = i - 1) {
for (float i = 7; i >= 0; i = i - 1) {
float player_index = i;

float player_number = getplayerkeyfloat(i, "client_index");

// Don't render our own Icon.
if (player_index + 1 == getstatf(STAT_PLAYERNUM))
if (player_number == getstatf(STAT_PLAYERNUM))
continue;

// Player is not in Last Stand.
Expand All @@ -2053,8 +2059,6 @@ void() HUD_ReviveIcons =
// Revive Icon should grow more and more red over time.
if (revive_icons[player_index].state == 1)
revive_icons[player_index].timer += frametime;

float player_number = getplayerkeyfloat(i, "client_index");

//string text = getplayerkeyvalue(i, "name");
entity client = findfloat(world, playernum, player_number);
Expand Down
3 changes: 3 additions & 0 deletions source/client/main.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,9 @@ noref void() CSQC_Parse_Event =
break;
case EVENT_REVIVECHANGE:
float revivechange_player_index = readbyte() - 1; // playernum starts at one.
if (revivechange_player_index < 0)
return;

float state = readbyte();
revive_icons[revivechange_player_index].state = state;
break;
Expand Down