nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-21 19:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

CLIENT: Fix displaying point increments for all clients in MP

Browse source
This commit is contained in:
Steam Deck User 2023-01-24 20:41:11 -05:00
parent eab8eaa87c
commit ad6a0cc25e
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/client/hud.qc
View file

@ -191,12 +191,13 @@ var struct
float opacity; // the opacity of the text_string as it progresses float opacity; // the opacity of the text_string as it progresses
float string_width; // the width of text_string float string_width; // the width of text_string
float occupied; // is this array being used/occupied? float occupied; // is this array being used/occupied?
float playerid; // who does this element belong to?
string text_string; // either '+(difference)' or '-(difference)' string text_string; // either '+(difference)' or '-(difference)'
} point_elements[MAX_POINT_ELEMENTS]; } point_elements[MAX_POINT_ELEMENTS];
float last_point_element_index; float last_point_element_index;
void(float amount) RegisterPointChange = void(float amount, float playernum) RegisterPointChange =
{ {
if (last_point_element_index >= MAX_POINT_ELEMENTS) if (last_point_element_index >= MAX_POINT_ELEMENTS)
last_point_element_index = 0; last_point_element_index = 0;
@ -206,6 +207,9 @@ void(float amount) RegisterPointChange =
// set the difference amount // set the difference amount
point_elements[index].difference = amount; point_elements[index].difference = amount;
// assign it to the player
point_elements[index].playerid = playernum;
// fill our text string // fill our text string
if (point_elements[index].difference > 0) { if (point_elements[index].difference > 0) {
point_elements[index].text_string = strcat("+", ftos(point_elements[index].difference)); point_elements[index].text_string = strcat("+", ftos(point_elements[index].difference));
@ -235,7 +239,7 @@ void(float amount) RegisterPointChange =
// set our x and y positions // set our x and y positions
point_elements[index].x_position = 0; point_elements[index].x_position = 0;
point_elements[index].y_position = 0.720 * g_height; point_elements[index].y_position = 0.780*g_height - 0.06*g_height*playernum;
// start with an opacity of 1 // start with an opacity of 1
point_elements[index].opacity = 1; point_elements[index].opacity = 1;
@ -248,7 +252,7 @@ void(float amount) RegisterPointChange =
active_point_elements++; active_point_elements++;
} }
void(float pwidth, float width, float height) PointUpdate = void(float pwidth, float width, float height, float playernum) PointUpdate =
{ {
if (active_point_elements == 0) if (active_point_elements == 0)
return; return;
@ -256,6 +260,9 @@ void(float pwidth, float width, float height) PointUpdate =
vector POINT_DIFF_COLOR; vector POINT_DIFF_COLOR;
for (float i = 0; i < MAX_POINT_ELEMENTS; i++) { for (float i = 0; i < MAX_POINT_ELEMENTS; i++) {
if (point_elements[i].playerid != playernum)
continue;
if (point_elements[i].opacity <= 0 && point_elements[i].occupied == true) { if (point_elements[i].opacity <= 0 && point_elements[i].occupied == true) {
point_elements[i].occupied = false; point_elements[i].occupied = false;
active_point_elements--; active_point_elements--;
@ -306,7 +313,7 @@ void(float width, float height) HUD_Points =
x = ((width + backwidth) - pointwidth)/2; x = ((width + backwidth) - pointwidth)/2;
drawpic([backwidth ,0.70*height - (.061*height*i),0], getImage("moneyback.tga"), [0.2*width, 0.07*height, 0], [1,1,1], 1); drawpic([backwidth ,0.70*height - (.061*height*i),0], getImage("moneyback.tga"), [0.2*width, 0.07*height, 0], [1,1,1], 1);
drawstring([x, 0.715*height - 0.06*height*i, 0], ftos(playerpoints[i]), [0.022*width, 0.022*width, 0], TEXTCOLOR, 1, 0); drawstring([x, 0.715*height - 0.06*height*i, 0], ftos(playerpoints[i]), [0.022*width, 0.022*width, 0], TEXTCOLOR, 1, 0);
PointUpdate(backwidth * 1.025, width, height); PointUpdate(backwidth * 1.025, width, height, i+1);
} }
else { else {
backwidth = 0.85*width; backwidth = 0.85*width;
@ -314,6 +321,7 @@ void(float width, float height) HUD_Points =
x = ((width + backwidth) - pointwidth)/2; x = ((width + backwidth) - pointwidth)/2;
drawpic([backwidth, 0.70*height - (.071*height*i*0.8),0], getImage("moneyback.tga"), [0.2*width*0.8, 0.07*height*0.8, 0], [1,1,1], 0); drawpic([backwidth, 0.70*height - (.071*height*i*0.8),0], getImage("moneyback.tga"), [0.2*width*0.8, 0.07*height*0.8, 0], [1,1,1], 0);
drawstring([x, 0.715*height - 0.07*height*i*0.8, 0], ftos(playerpoints[i]), [0.022*width*0.8, 0.022*width*0.8, 0], TEXTCOLOR, 1, 0); drawstring([x, 0.715*height - 0.07*height*i*0.8, 0], ftos(playerpoints[i]), [0.022*width*0.8, 0.022*width*0.8, 0], TEXTCOLOR, 1, 0);
PointUpdate(backwidth * 1.025, width, height, i+1);
} }
} }
} }

2
source/client/main.qc
View file

@ -1032,7 +1032,7 @@ noref void() CSQC_Parse_Event =
case EVENT_POINTUPDATE: case EVENT_POINTUPDATE:
float playernum = readbyte(); float playernum = readbyte();
float temppoints = readlong(); float temppoints = readlong();
RegisterPointChange(readlong()); RegisterPointChange(readlong(), playernum);
float tempkills = readlong(); float tempkills = readlong();
string tempname = readstring(); string tempname = readstring();