mirror of
https://github.com/nzp-team/glquake.git
synced 2024-11-10 06:31:35 +00:00
more hud stuff, add scale to drawstring
This commit is contained in:
Ian
parent
03902bd47a
commit
bf4df2b74f
5 changed files with 71 additions and 67 deletions
BIN
.DS_Store
vendored
BIN
.DS_Store
vendored
Binary file not shown.
BIN
nzportable.3dsx
BIN
nzportable.3dsx
Binary file not shown.
BIN
nzportable.elf
BIN
nzportable.elf
Binary file not shown.
106
source/cl_hud.c
106
source/cl_hud.c
|
|
@ -1133,11 +1133,26 @@ HUD_Powerups
|
|||
*/
|
||||
void HUD_Powerups (void)
|
||||
{
|
||||
int count;
|
||||
|
||||
if(cl.stats[STAT_X2])
|
||||
Draw_StretchPic ((vid.width/2) - 30,0, x2pic, 28, 28);
|
||||
if(cl.stats[STAT_INSTA])
|
||||
Draw_StretchPic ((vid.width/2) + 2,0, instapic, 28, 28);
|
||||
// horrible way to offset check :)))))))))))))))))) :DDDDDDDD XOXO
|
||||
|
||||
if (cl.stats[STAT_X2])
|
||||
count++;
|
||||
|
||||
if (cl.stats[STAT_INSTA])
|
||||
count++;
|
||||
|
||||
// both are avail draw fixed order
|
||||
if (count == 2) {
|
||||
Draw_StretchPic((vid.width/2) - 27, 240 - 29, x2pic, 26, 26);
|
||||
Draw_StretchPic((vid.width/2) + 3, 240 - 29, instapic, 26, 26);
|
||||
} else {
|
||||
if (cl.stats[STAT_X2])
|
||||
Draw_StretchPic((vid.width/2) - 13, 240 - 29, x2pic, 26, 26);
|
||||
if(cl.stats[STAT_INSTA])
|
||||
Draw_StretchPic ((vid.width/2) - 13, 240 - 29, instapic, 28, 28);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1249,43 +1264,29 @@ int IsDualWeapon(int weapon)
|
|||
|
||||
void HUD_Ammo (void)
|
||||
{
|
||||
char str[12];
|
||||
int xplus;
|
||||
char *magstring;
|
||||
char* magstring;
|
||||
int reslen;
|
||||
|
||||
y_value = vid.height - 16;
|
||||
|
||||
magstring = va("%i", cl.stats[STAT_CURRENTMAG]);
|
||||
|
||||
xplus = HUD_itoa(cl.stats[STAT_CURRENTMAG], str);
|
||||
reslen = strlen(va("/%i", cl.stats[STAT_AMMO]));
|
||||
|
||||
//
|
||||
// Magazine
|
||||
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 1) >= cl.stats[STAT_CURRENTMAG])
|
||||
Draw_ColoredString(vid.width - 42 - (xplus*8), y_value, magstring, 255, 0, 0, 255, 1);
|
||||
else
|
||||
Draw_ColoredString(vid.width - 42 - (xplus*8), y_value, magstring, 255, 255, 255, 255, 1);
|
||||
|
||||
// Second mag for dual weps
|
||||
if (IsDualWeapon(cl.stats[STAT_ACTIVEWEAPON])) {
|
||||
magstring = va("%i", cl.stats[STAT_CURRENTMAG2]);
|
||||
xplus = HUD_itoa(cl.stats[STAT_CURRENTMAG2], str);
|
||||
|
||||
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 1) >= cl.stats[STAT_CURRENTMAG2])
|
||||
Draw_ColoredString(vid.width - 56 - (xplus*8), y_value, magstring, 255, 0, 0, 255, 1);
|
||||
else
|
||||
Draw_ColoredString(vid.width - 56 - (xplus*8), y_value, magstring, 255, 255, 255, 255, 1);
|
||||
//
|
||||
magstring = va("%i", cl.stats[STAT_CURRENTMAG]);
|
||||
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 1) >= cl.stats[STAT_CURRENTMAG]) {
|
||||
Draw_ColoredString((355-(reslen*8)) - strlen(magstring)*8, 218, magstring, 255, 0, 0, 255, 1);
|
||||
} else {
|
||||
Draw_ColoredString((355-(reslen*8)) - strlen(magstring)*8, 218, magstring, 255, 255, 255, 255, 1);
|
||||
}
|
||||
|
||||
// Reserve ammo
|
||||
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 0) >= cl.stats[STAT_AMMO])
|
||||
{
|
||||
Draw_ColoredString (vid.width - 42, y_value, "/", 255, 0, 0, 255, 1);
|
||||
Draw_ColoredString (vid.width - 34, y_value, va ("%i",cl.stats[STAT_AMMO]), 255, 0, 0, 255, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
Draw_ColoredString (vid.width - 42, y_value, "/", 255, 255, 255, 255, 1);
|
||||
Draw_ColoredString (vid.width - 34, y_value, va ("%i",cl.stats[STAT_AMMO]), 255, 255, 255, 255, 1);
|
||||
//
|
||||
// Reserve Ammo
|
||||
//
|
||||
magstring = va("/%i", cl.stats[STAT_AMMO]);
|
||||
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 0) >= cl.stats[STAT_AMMO]) {
|
||||
Draw_ColoredString(355 - strlen(magstring)*8, 218, magstring, 255, 0, 0, 255, 1);
|
||||
} else {
|
||||
Draw_ColoredString(355 - strlen(magstring)*8, 218, magstring, 255, 255, 255, 255, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1299,12 +1300,17 @@ void HUD_AmmoString (void)
|
|||
{
|
||||
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 1) >= cl.stats[STAT_CURRENTMAG])
|
||||
{
|
||||
int x;
|
||||
|
||||
if (0 < cl.stats[STAT_AMMO] && cl.stats[STAT_CURRENTMAG] >= 0) {
|
||||
Draw_ColoredString ((vid.width)/2, (vid.height)/2 + 40, "Reload", 255, 255, 255, 255, 1);
|
||||
x = (vid.width - strlen("Reload")*8)/2;
|
||||
Draw_ColoredString (x, 140, "Reload", 255, 255, 255, 255, 1);
|
||||
} else if (0 < cl.stats[STAT_CURRENTMAG]) {
|
||||
Draw_ColoredString ((vid.width)/2, (vid.height)/2 + 40, "LOW AMMO", 255, 255, 0, 255, 1);
|
||||
x = (vid.width - strlen("LOW AMMO")*8)/2;
|
||||
Draw_ColoredString (x, 140, "LOW AMMO", 255, 255, 0, 255, 1);
|
||||
} else {
|
||||
Draw_ColoredString ((vid.width)/2, (vid.height)/2 + 40, "NO AMMO", 255, 0, 0, 255, 1);
|
||||
x = (vid.width - strlen("NO AMMO")*8)/2;
|
||||
Draw_ColoredString (x, 140, "NO AMMO", 255, 0, 0, 255, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1319,23 +1325,21 @@ HUD_Grenades
|
|||
|
||||
void HUD_Grenades (void)
|
||||
{
|
||||
if (cl.stats[STAT_GRENADES])
|
||||
{
|
||||
x_value = vid.width - 50;
|
||||
y_value = vid.height - 16 - fragpic->height - 4;
|
||||
}
|
||||
Draw_StretchPic (356, 205, fragpic, 22, 22);
|
||||
if (cl.stats[STAT_GRENADES] & UI_FRAG)
|
||||
{
|
||||
Draw_StretchPic (x_value, y_value, fragpic, 22, 22);
|
||||
if (cl.stats[STAT_PRIGRENADES] <= 0)
|
||||
Draw_ColoredString (x_value + 12, y_value + 12, va ("%i",cl.stats[STAT_PRIGRENADES]), 255, 0, 0, 255, 1);
|
||||
Draw_ColoredString (356 + 12, 205 + 16, va ("%i",cl.stats[STAT_PRIGRENADES]), 255, 0, 0, 255, 1);
|
||||
else
|
||||
Draw_String (x_value + 12, y_value + 12, va ("%i",cl.stats[STAT_PRIGRENADES]));
|
||||
Draw_String (356 + 12, 205 + 16, va ("%i",cl.stats[STAT_PRIGRENADES]));
|
||||
}
|
||||
Draw_StretchPic (356 + 20, 205, bettypic, 22, 22);
|
||||
if (cl.stats[STAT_GRENADES] & UI_BETTY)
|
||||
{
|
||||
Draw_StretchPic (x_value - fragpic->width - 5, y_value, bettypic, 22, 22);
|
||||
Draw_String (x_value - fragpic->width + 7, y_value + 12, va ("%i",cl.stats[STAT_SECGRENADES]));
|
||||
if (cl.stats[STAT_PRIGRENADES] <= 0)
|
||||
Draw_ColoredString (356 + 20 + 12, 205 + 16, va ("%i",cl.stats[STAT_SECGRENADES]), 255, 0, 0, 255, 1);
|
||||
else
|
||||
Draw_String (356 + 20 + 12, 205 + 16, va ("%i",cl.stats[STAT_SECGRENADES]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1349,12 +1353,12 @@ void HUD_Weapon (void)
|
|||
char str[32];
|
||||
float l;
|
||||
x_value = vid.width;
|
||||
y_value = vid.height - 16 - fragpic->height - 4 - 16;
|
||||
y_value = 205;
|
||||
|
||||
strcpy(str, pr_strings+sv_player->v.Weapon_Name);
|
||||
l = strlen(str);
|
||||
|
||||
x_value = vid.width - 8 - l*8;
|
||||
x_value = 355 - l*8;
|
||||
Draw_String (x_value, y_value, str);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@ This is the same as Draw_Character, but with RGBA color codes.
|
|||
================
|
||||
*/
|
||||
extern cvar_t scr_coloredtext;
|
||||
void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a)
|
||||
void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a, int scale)
|
||||
{
|
||||
int row, col;
|
||||
float frow, fcol, size;
|
||||
|
|
@ -515,7 +515,7 @@ void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float
|
|||
|
||||
frow = row*0.0625;
|
||||
fcol = col*0.0625;
|
||||
size = 0.0625;
|
||||
size = 0.0625*(float)scale;
|
||||
|
||||
GL_Bind (char_texture);
|
||||
|
||||
|
|
@ -526,12 +526,12 @@ void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float
|
|||
glBegin (GL_QUADS);
|
||||
glTexCoord2f (fcol, frow);
|
||||
glVertex2f (x, y);
|
||||
glTexCoord2f (fcol + size, frow);
|
||||
glVertex2f (x+8, y);
|
||||
glTexCoord2f (fcol + size, frow + size);
|
||||
glVertex2f (x+8, y+8);
|
||||
glTexCoord2f (fcol, frow + size);
|
||||
glVertex2f (x, y+8);
|
||||
glTexCoord2f (fcol + (float)(size/(float)scale), frow);
|
||||
glVertex2f (x+(8*(scale)), y);
|
||||
glTexCoord2f (fcol + (float)(size/(float)scale), frow + (float)(size/(float)scale));
|
||||
glVertex2f (x+(8*(scale)), y+(8*(scale)));
|
||||
glTexCoord2f (fcol, frow + (float)(size/(float)scale));
|
||||
glVertex2f (x, y+(8*(scale)));
|
||||
glEnd ();
|
||||
glDisable(GL_ALPHA_TEST);
|
||||
}
|
||||
|
|
@ -550,9 +550,9 @@ void Draw_ColoredString(int x, int y, char *str, float r, float g, float b, floa
|
|||
{
|
||||
while (*str)
|
||||
{
|
||||
Draw_CharacterRGBA (x, y, *str, r, g, b, a);
|
||||
Draw_CharacterRGBA (x, y, *str, r, g, b, a, scale);
|
||||
str++;
|
||||
x += 8;
|
||||
x += 8*scale;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1093,7 +1093,7 @@ void Draw_Crosshair (void)
|
|||
|
||||
if (cl.stats[STAT_ACTIVEWEAPON] == W_M2 || cl.stats[STAT_ACTIVEWEAPON] == W_TESLA || cl.stats[STAT_ACTIVEWEAPON] == W_DG3)
|
||||
{
|
||||
Draw_CharacterRGBA((vid.width)/2-4, (vid.height)/2, 'O', 255, col, col, crosshair_opacity);
|
||||
Draw_CharacterRGBA((vid.width)/2-4, (vid.height)/2, 'O', 255, col, col, crosshair_opacity, 1);
|
||||
}
|
||||
else if (crosshair.value == 1 && cl.stats[STAT_ZOOM] != 1 && cl.stats[STAT_ZOOM] != 2 && cl.stats[STAT_ACTIVEWEAPON] != W_PANZER)
|
||||
{
|
||||
|
|
@ -1112,22 +1112,22 @@ void Draw_Crosshair (void)
|
|||
|
||||
x_value = (vid.width - 8)/2 - crosshair_offset_step;
|
||||
y_value = (vid.height - 8)/2;
|
||||
Draw_CharacterRGBA(x_value, y_value, 158, 255, col, col, crosshair_opacity);
|
||||
Draw_CharacterRGBA(x_value, y_value, 158, 255, col, col, crosshair_opacity, 1);
|
||||
|
||||
x_value = (vid.width - 8)/2 + crosshair_offset_step;
|
||||
y_value = (vid.height - 8)/2;
|
||||
Draw_CharacterRGBA(x_value, y_value, 158, 255, col, col, crosshair_opacity);
|
||||
Draw_CharacterRGBA(x_value, y_value, 158, 255, col, col, crosshair_opacity, 1);
|
||||
|
||||
x_value = (vid.width - 8)/2;
|
||||
y_value = (vid.height - 8)/2 - crosshair_offset_step;
|
||||
Draw_CharacterRGBA(x_value, y_value, 157, 255, col, col, crosshair_opacity);
|
||||
Draw_CharacterRGBA(x_value, y_value, 157, 255, col, col, crosshair_opacity, 1);
|
||||
|
||||
x_value = (vid.width - 8)/2;
|
||||
y_value = (vid.height - 8)/2 + crosshair_offset_step;
|
||||
Draw_CharacterRGBA(x_value, y_value, 157, 255, col, col, crosshair_opacity);
|
||||
Draw_CharacterRGBA(x_value, y_value, 157, 255, col, col, crosshair_opacity, 1);
|
||||
}
|
||||
else if (crosshair.value && cl.stats[STAT_ZOOM] != 1 && cl.stats[STAT_ZOOM] != 2)
|
||||
Draw_CharacterRGBA((vid.width - 8)/2, (vid.height - 8)/2, '.', 255, col, col, crosshair_opacity);
|
||||
Draw_CharacterRGBA((vid.width - 8)/2, (vid.height - 8)/2, '.', 255, col, col, crosshair_opacity, 1);
|
||||
if (cl.stats[STAT_ZOOM] == 2)
|
||||
Draw_Pic (0, 0, sniper_scope);
|
||||
if (Hitmark_Time > sv.time)
|
||||
|
|
|
|||
Loading…
Reference in a new issue