mirror of
https://github.com/nzp-team/glquake.git
synced 2024-11-12 23:44:38 +00:00
Fix blood rendering, center round text (regressed due to scale), limit max fps to 30
This commit is contained in:
parent
4dba825678
commit
18fac3a2a7
3 changed files with 5 additions and 4 deletions
|
@ -600,7 +600,7 @@ void HUD_Rounds (void)
|
||||||
if (!value)
|
if (!value)
|
||||||
value = 255;
|
value = 255;
|
||||||
|
|
||||||
Draw_ColoredString(vid.width/2 - (strlen("Round")*8)/2, 80, "Round", 255, value, value, 255, 2);
|
Draw_ColoredString(vid.width/2 - (strlen("Round")*16)/2, 80, "Round", 255, value, value, 255, 2);
|
||||||
|
|
||||||
value -= cl.time * 0.4;
|
value -= cl.time * 0.4;
|
||||||
|
|
||||||
|
@ -614,7 +614,7 @@ void HUD_Rounds (void)
|
||||||
// Now, fade out, and start fading worldtext in
|
// Now, fade out, and start fading worldtext in
|
||||||
// ~3s for fade out,
|
// ~3s for fade out,
|
||||||
else if (textstate == 1) {
|
else if (textstate == 1) {
|
||||||
Draw_ColoredString(vid.width/2 - (strlen("Round")*8)/2, 80, "Round", 255, 0, 0, value, 2);
|
Draw_ColoredString(vid.width/2 - (strlen("Round")*16)/2, 80, "Round", 255, 0, 0, value, 2);
|
||||||
|
|
||||||
HUD_WorldText(value2);
|
HUD_WorldText(value2);
|
||||||
Draw_ColoredString(4, vid.height/2 + 32, "'Nazi Zombies'", 255, 255, 255, value2, 1);
|
Draw_ColoredString(4, vid.height/2 + 32, "'Nazi Zombies'", 255, 255, 255, value2, 1);
|
||||||
|
|
|
@ -644,7 +644,8 @@ void Draw_ColorPic (int x, int y, qpic_t *pic, float r, float g , float b, float
|
||||||
Scrap_Upload ();
|
Scrap_Upload ();
|
||||||
gl = (glpic_t *)pic->data;
|
gl = (glpic_t *)pic->data;
|
||||||
|
|
||||||
glEnable(GL_ALPHA_TEST);
|
// naievil -- this was breaking blood hud
|
||||||
|
//glEnable(GL_ALPHA_TEST);
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glColor4f(r/255.0,g/255.0,b/255.0,a/255.0);
|
glColor4f(r/255.0,g/255.0,b/255.0,a/255.0);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
|
|
@ -56,7 +56,7 @@ byte *host_colormap;
|
||||||
|
|
||||||
cvar_t host_framerate = {"host_framerate","0"}; // set for slow motion
|
cvar_t host_framerate = {"host_framerate","0"}; // set for slow motion
|
||||||
cvar_t host_speeds = {"host_speeds","0"}; // set for running times
|
cvar_t host_speeds = {"host_speeds","0"}; // set for running times
|
||||||
cvar_t host_maxfps = {"host_maxfps", "72"};
|
cvar_t host_maxfps = {"host_maxfps", "30"};
|
||||||
|
|
||||||
cvar_t sys_ticrate = {"sys_ticrate","0.05"};
|
cvar_t sys_ticrate = {"sys_ticrate","0.05"};
|
||||||
cvar_t serverprofile = {"serverprofile","0"};
|
cvar_t serverprofile = {"serverprofile","0"};
|
||||||
|
|
Loading…
Reference in a new issue