mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2025-03-14 23:12:41 +00:00
client: cleanup statusbar line
This commit is contained in:
Denis Pauk
parent
fd4a7abc58
commit
13bd293c17
3 changed files with 91 additions and 49 deletions
|
|
@ -163,7 +163,6 @@ Goals, fully finished goals could be checked in [here](CHANGELOG):
|
|||
* [ ] Fix statusbar for DoD `roarke`,
|
||||
* [ ] Group `it_pic` images in vulkan render,
|
||||
* [ ] Rearange surfaces in vulkan render before render,
|
||||
* [ ] Fully implement `target_camera`,
|
||||
* [ ] Fully implement `misc_flare`,
|
||||
* [ ] Single player ReRelease support,
|
||||
* [ ] Support effects and additional flags for ReRelease when possible.
|
||||
|
|
|
|||
|
|
@ -950,13 +950,13 @@ DrawHUDStringScaled(const char *string, int x, int y, int centerwidth, int xor,
|
|||
for (i = 0; i < width; i++)
|
||||
{
|
||||
Draw_CharScaled(x, y, line[i] ^ xor, factor);
|
||||
x += 8*factor;
|
||||
x += 8 * factor;
|
||||
}
|
||||
|
||||
if (*string)
|
||||
{
|
||||
string++; /* skip the \n */
|
||||
y += 8*factor;
|
||||
y += 8 * factor;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -986,7 +986,7 @@ SCR_DrawFieldScaled(int x, int y, int color, int width, int value, float factor)
|
|||
}
|
||||
|
||||
SCR_AddDirtyPoint(x, y);
|
||||
SCR_AddDirtyPoint(x + (width * CHAR_WIDTH + 2)*factor, y + factor*24);
|
||||
SCR_AddDirtyPoint(x + (width * CHAR_WIDTH + 2) * factor, y + factor * 24);
|
||||
|
||||
Com_sprintf(num, sizeof(num), "%i", value);
|
||||
l = (int)strlen(num);
|
||||
|
|
@ -1066,13 +1066,9 @@ void
|
|||
SCR_ExecuteLayoutString(char *s)
|
||||
{
|
||||
int x, y;
|
||||
int value;
|
||||
const char *token;
|
||||
int width;
|
||||
int index;
|
||||
clientinfo_t *ci;
|
||||
float scale;
|
||||
|
||||
float scale = SCR_GetHUDScale();
|
||||
scale = SCR_GetHUDScale();
|
||||
|
||||
if ((cls.state != ca_active) || !cl.refresh_prepped)
|
||||
{
|
||||
|
|
@ -1089,6 +1085,8 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
while (s)
|
||||
{
|
||||
const char *token;
|
||||
|
||||
token = COM_Parse(&s);
|
||||
|
||||
if (!strcmp(token, "xl"))
|
||||
|
|
@ -1135,13 +1133,15 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
if (!strcmp(token, "pic"))
|
||||
{
|
||||
int index, value;
|
||||
|
||||
/* draw a pic from a stat number */
|
||||
token = COM_Parse(&s);
|
||||
index = (int)strtol(token, (char **)NULL, 10);
|
||||
|
||||
if ((index < 0) || (index >= MAX_STATS))
|
||||
{
|
||||
Com_DPrintf("%s: bad stats index %d (0x%x)",
|
||||
Com_DPrintf("%s: bad stats index %d (0x%x) in pic\n",
|
||||
__func__, index, index);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1150,16 +1150,21 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
if (value >= MAX_IMAGES)
|
||||
{
|
||||
Com_DPrintf("%s: Pic %d >= MAX_IMAGES",
|
||||
Com_DPrintf("%s: Pic %d >= MAX_IMAGES in pic\n",
|
||||
__func__, value);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cl.configstrings[CS_IMAGES + value][0] != '\0')
|
||||
{
|
||||
const char *text;
|
||||
int w, h;
|
||||
|
||||
text = cl.configstrings[CS_IMAGES + value];
|
||||
Draw_GetPicSize(&w, &h, text);
|
||||
SCR_AddDirtyPoint(x, y);
|
||||
SCR_AddDirtyPoint(x + 23 * scale, y + 23 * scale);
|
||||
Draw_PicScaled(x, y, cl.configstrings[CS_IMAGES + value], scale);
|
||||
SCR_AddDirtyPoint(x + (w - 1) * scale, y + (h - 1) * scale);
|
||||
Draw_PicScaled(x, y, text, scale);
|
||||
}
|
||||
|
||||
continue;
|
||||
|
|
@ -1168,21 +1173,23 @@ SCR_ExecuteLayoutString(char *s)
|
|||
if (!strcmp(token, "client"))
|
||||
{
|
||||
/* draw a deathmatch client block */
|
||||
int score, ping, time;
|
||||
int score, ping, time, value;
|
||||
clientinfo_t *ci;
|
||||
|
||||
token = COM_Parse(&s);
|
||||
x = viddef.width / 2 - scale*160 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
x = viddef.width / 2 - scale * 160 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
token = COM_Parse(&s);
|
||||
y = viddef.height / 2 - scale*120 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
y = viddef.height / 2 - scale * 120 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
SCR_AddDirtyPoint(x, y);
|
||||
SCR_AddDirtyPoint(x + scale*159, y + scale*31);
|
||||
SCR_AddDirtyPoint(x + scale * 159, y + scale * 31);
|
||||
|
||||
token = COM_Parse(&s);
|
||||
value = (int)strtol(token, (char **)NULL, 10);
|
||||
|
||||
if ((value >= MAX_CLIENTS) || (value < 0))
|
||||
{
|
||||
Com_Error(ERR_DROP, "client >= MAX_CLIENTS");
|
||||
Com_DPrintf("%s: client >= MAX_CLIENTS in client\n", __func__);
|
||||
continue;
|
||||
}
|
||||
|
||||
ci = &cl.clientinfo[value];
|
||||
|
|
@ -1196,11 +1203,11 @@ SCR_ExecuteLayoutString(char *s)
|
|||
token = COM_Parse(&s);
|
||||
time = (int)strtol(token, (char **)NULL, 10);
|
||||
|
||||
DrawAltStringScaled(x + scale*32, y, ci->name, scale);
|
||||
DrawAltStringScaled(x + scale*32, y + scale*8, "Score: ", scale);
|
||||
DrawAltStringScaled(x + scale*(32 + 7 * 8), y + scale*8, va("%i", score), scale);
|
||||
DrawStringScaled(x + scale*32, y + scale*16, va("Ping: %i", ping), scale);
|
||||
DrawStringScaled(x + scale*32, y + scale*24, va("Time: %i", time), scale);
|
||||
DrawAltStringScaled(x + scale * 32, y, ci->name, scale);
|
||||
DrawAltStringScaled(x + scale * 32, y + scale * 8, "Score: ", scale);
|
||||
DrawAltStringScaled(x + scale * (32 + 7 * 8), y + scale * 8, va("%i", score), scale);
|
||||
DrawStringScaled(x + scale * 32, y + scale * 16, va("Ping: %i", ping), scale);
|
||||
DrawStringScaled(x + scale * 32, y + scale * 24, va("Time: %i", time), scale);
|
||||
|
||||
if (!ci->icon)
|
||||
{
|
||||
|
|
@ -1214,22 +1221,24 @@ SCR_ExecuteLayoutString(char *s)
|
|||
if (!strcmp(token, "ctf"))
|
||||
{
|
||||
/* draw a ctf client block */
|
||||
int score, ping;
|
||||
int score, ping, value;
|
||||
clientinfo_t *ci;
|
||||
char block[80];
|
||||
|
||||
token = COM_Parse(&s);
|
||||
x = viddef.width / 2 - scale*160 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
x = viddef.width / 2 - scale * 160 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
token = COM_Parse(&s);
|
||||
y = viddef.height / 2 - scale*120 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
y = viddef.height / 2 - scale * 120 + scale*(int)strtol(token, (char **)NULL, 10);
|
||||
SCR_AddDirtyPoint(x, y);
|
||||
SCR_AddDirtyPoint(x + scale*159, y + scale*31);
|
||||
SCR_AddDirtyPoint(x + scale * 159, y + scale * 31);
|
||||
|
||||
token = COM_Parse(&s);
|
||||
value = (int)strtol(token, (char **)NULL, 10);
|
||||
|
||||
if ((value >= MAX_CLIENTS) || (value < 0))
|
||||
{
|
||||
Com_Error(ERR_DROP, "client >= MAX_CLIENTS");
|
||||
Com_DPrintf("%s: client >= MAX_CLIENTS in client\n", __func__);
|
||||
continue;
|
||||
}
|
||||
|
||||
ci = &cl.clientinfo[value];
|
||||
|
|
@ -1262,16 +1271,21 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
if (!strcmp(token, "picn"))
|
||||
{
|
||||
int w, h;
|
||||
|
||||
/* draw a pic from a name */
|
||||
token = COM_Parse(&s);
|
||||
Draw_GetPicSize(&w, &h, token);
|
||||
SCR_AddDirtyPoint(x, y);
|
||||
SCR_AddDirtyPoint(x + scale * 23, y + scale * 23);
|
||||
Draw_PicScaled(x, y, (char *)token, scale);
|
||||
SCR_AddDirtyPoint(x + scale * (w - 1), y + scale * (h - 1));
|
||||
Draw_PicScaled(x, y, token, scale);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!strcmp(token, "num"))
|
||||
{
|
||||
int value, width;
|
||||
|
||||
/* draw a number */
|
||||
token = COM_Parse(&s);
|
||||
width = (int)strtol(token, (char **)NULL, 10);
|
||||
|
|
@ -1284,7 +1298,7 @@ SCR_ExecuteLayoutString(char *s)
|
|||
if (!strcmp(token, "hnum"))
|
||||
{
|
||||
/* health number */
|
||||
int color;
|
||||
int color, value, width;
|
||||
|
||||
width = 3;
|
||||
value = cl.frame.playerstate.stats[STAT_HEALTH];
|
||||
|
|
@ -1314,7 +1328,7 @@ SCR_ExecuteLayoutString(char *s)
|
|||
if (!strcmp(token, "anum"))
|
||||
{
|
||||
/* ammo number */
|
||||
int color;
|
||||
int color, value, width;
|
||||
|
||||
width = 3;
|
||||
value = cl.frame.playerstate.stats[STAT_AMMO];
|
||||
|
|
@ -1344,7 +1358,7 @@ SCR_ExecuteLayoutString(char *s)
|
|||
if (!strcmp(token, "rnum"))
|
||||
{
|
||||
/* armor number */
|
||||
int color;
|
||||
int color, value, width;
|
||||
|
||||
width = 3;
|
||||
value = cl.frame.playerstate.stats[STAT_ARMOR];
|
||||
|
|
@ -1367,19 +1381,25 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
if (!strcmp(token, "stat_string"))
|
||||
{
|
||||
int index;
|
||||
|
||||
token = COM_Parse(&s);
|
||||
index = (int)strtol(token, (char **)NULL, 10);
|
||||
|
||||
if ((index < 0) || (index >= MAX_STATS))
|
||||
{
|
||||
Com_Error(ERR_DROP, "Bad stat_string index");
|
||||
Com_DPrintf("%s: bad stats index %d (0x%x) in stat_string\n",
|
||||
__func__, index, index);
|
||||
continue;
|
||||
}
|
||||
|
||||
index = cl.frame.playerstate.stats[index];
|
||||
|
||||
if ((index < 0) || (index >= MAX_CONFIGSTRINGS))
|
||||
{
|
||||
Com_Error(ERR_DROP, "Bad stat_string index");
|
||||
Com_DPrintf("%s: bad stats index %d (0x%x) in stat_string\n",
|
||||
__func__, index, index);
|
||||
continue;
|
||||
}
|
||||
|
||||
DrawStringScaled(x, y, cl.configstrings[index], scale);
|
||||
|
|
@ -1416,9 +1436,22 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
if (!strcmp(token, "if"))
|
||||
{
|
||||
int index, value;
|
||||
|
||||
/* draw a number */
|
||||
token = COM_Parse(&s);
|
||||
value = cl.frame.playerstate.stats[(int)strtol(token, (char **)NULL, 10)];
|
||||
index = (int)strtol(token, (char **)NULL, 10);
|
||||
|
||||
if ((index < 0) || (index >= MAX_STATS))
|
||||
{
|
||||
Com_DPrintf("%s: bad stats index %d (0x%x) in if\n",
|
||||
__func__, index, index);
|
||||
value = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
value = cl.frame.playerstate.stats[index];
|
||||
}
|
||||
|
||||
if (!value)
|
||||
{
|
||||
|
|
@ -1431,6 +1464,14 @@ SCR_ExecuteLayoutString(char *s)
|
|||
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!strcmp(token, "endif") || (token && !token[0]))
|
||||
{
|
||||
/* just skip endif and empty line */
|
||||
continue;
|
||||
}
|
||||
|
||||
Com_DPrintf("%s: Unknown token: %s\n", __func__, token);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1547,8 +1588,8 @@ SCR_Framecounter(void) {
|
|||
|
||||
char str[10];
|
||||
snprintf(str, sizeof(str), "%3.2ffps", (1000.0 * 1000.0) / (avg / num));
|
||||
DrawStringScaled(viddef.width - scale*(strlen(str)*8 + 2), 0, str, scale);
|
||||
SCR_AddDirtyPoint(viddef.width - scale*(strlen(str)*8 + 2), 0);
|
||||
DrawStringScaled(viddef.width - scale * (strlen(str) * 8 + 2), 0, str, scale);
|
||||
SCR_AddDirtyPoint(viddef.width - scale * (strlen(str) * 8 + 2), 0);
|
||||
SCR_AddDirtyPoint(viddef.width, 0);
|
||||
} else if (cl_showfps->value >= 2) {
|
||||
// Calculate average of frames.
|
||||
|
|
@ -1580,17 +1621,17 @@ SCR_Framecounter(void) {
|
|||
char str[64];
|
||||
snprintf(str, sizeof(str), "Min: %7.2ffps, Max: %7.2ffps, Avg: %7.2ffps",
|
||||
(1000.0 * 1000.0) / min, (1000.0 * 1000.0) / max, (1000.0 * 1000.0) / (avg / num));
|
||||
DrawStringScaled(viddef.width - scale*(strlen(str)*8 + 2), 0, str, scale);
|
||||
SCR_AddDirtyPoint(viddef.width - scale*(strlen(str)*8 + 2), 0);
|
||||
DrawStringScaled(viddef.width - scale * (strlen(str) * 8 + 2), 0, str, scale);
|
||||
SCR_AddDirtyPoint(viddef.width - scale * (strlen(str) * 8 + 2), 0);
|
||||
SCR_AddDirtyPoint(viddef.width, 0);
|
||||
|
||||
if (cl_showfps->value > 2)
|
||||
{
|
||||
snprintf(str, sizeof(str), "Max: %5.2fms, Min: %5.2fms, Avg: %5.2fms",
|
||||
0.001f*min, 0.001f*max, 0.001f*(avg / num));
|
||||
DrawStringScaled(viddef.width - scale*(strlen(str)*8 + 2), scale*10, str, scale);
|
||||
SCR_AddDirtyPoint(viddef.width - scale*(strlen(str)*8 + 2), scale*10);
|
||||
SCR_AddDirtyPoint(viddef.width, scale+10);
|
||||
DrawStringScaled(viddef.width - scale*(strlen(str) * 8 + 2), scale * 10, str, scale);
|
||||
SCR_AddDirtyPoint(viddef.width - scale*(strlen(str) * 8 + 2), scale * 10);
|
||||
SCR_AddDirtyPoint(viddef.width, scale + 10);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1475,8 +1475,8 @@ SP_target_earthquake(edict_t *self)
|
|||
/*
|
||||
* QUAKED target_camera (1 0 0) (-8 -8 -8) (8 8 8)
|
||||
*
|
||||
* Creates a camera path as seen in the N64 version.
|
||||
*/
|
||||
* ReRelease: Creates a camera path as seen in the N64 version.
|
||||
*/
|
||||
static void
|
||||
camera_lookat_pathtarget(edict_t* self, vec3_t origin, vec3_t* dest)
|
||||
{
|
||||
|
|
@ -1729,7 +1729,8 @@ SP_target_camera(edict_t* self)
|
|||
|
||||
/*
|
||||
* QUAKED target_gravity (1 0 0) (-8 -8 -8) (8 8 8) NOTRAIL NOEFFECTS
|
||||
* [Sam-KEX] Changes gravity, as seen in the N64 version
|
||||
*
|
||||
* ReRelease: Changes gravity, as seen in the N64 version
|
||||
*/
|
||||
void
|
||||
use_target_gravity(edict_t *self, edict_t *other, edict_t *activator)
|
||||
|
|
@ -1746,8 +1747,9 @@ SP_target_gravity(edict_t* self)
|
|||
|
||||
/*
|
||||
* QUAKED target_soundfx (1 0 0) (-8 -8 -8) (8 8 8) NOTRAIL NOEFFECTS
|
||||
* [Sam-KEX] Plays a sound fx, as seen in the N64 version
|
||||
*/
|
||||
*
|
||||
* ReRelease: Plays a sound fx, as seen in the N64 version
|
||||
*/
|
||||
void
|
||||
update_target_soundfx(edict_t *self)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue