kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve order of displaying on HUD

Browse Source 
Now command console over hudmessages, hudmessages over flag icons/scores
and player's stats.
Also fixed length of the line in command console.
This commit is contained in:
aurhat
2015-12-13 22:10:30 +01:00
parent 957f1e49ca
commit cc2ac85dd5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/console.cpp
+1 -1
View File
@@ -137,7 +137,7 @@ int rendercommand(int x, int y, int w)
int width, height;
text_bounds(s, width, height, w);
y -= height - FONTH;
draw_text(s, x, y, 0xFF, 0xFF, 0xFF, 0xFF, cmdline.pos>=0 ? cmdline.pos + strlen(useprompt) + 1 : (int)strlen(s), w);
if (x >= 0) draw_text(s, x, y, 0xFF, 0xFF, 0xFF, 0xFF, cmdline.pos>=0 ? cmdline.pos + strlen(useprompt) + 1 : (int)strlen(s), w);
return height;
}
source/src/renderhud.cpp
+7 -2
View File
@@ -816,7 +816,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
char *infostr = editinfo();
int commandh = 1570 + FONTH;
if(command) commandh -= rendercommand(20, 1570, VIRTW);
if(command) commandh -= rendercommand(-1, 1570, VIRTW - FONTH); // dryrun to get height
else if(infostr) draw_text(infostr, 20, 1570);
else if(targetplayer && showtargetname) draw_text(colorname(targetplayer), 20, 1570);
glLoadIdentity();
@@ -1014,7 +1014,6 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
}
}
if(!hidehudmsgs) hudmsgs.render();
if(p->state == CS_ALIVE || (p->state == CS_DEAD && p->spectatemode == SM_DEATHCAM))
{
glLoadIdentity();
@@ -1068,6 +1067,12 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
}
}
if(!hidehudmsgs) hudmsgs.render();
glLoadIdentity();
glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
if(command) commandh -= rendercommand(20, 1570, VIRTW - FONTH);
glDisable(GL_BLEND);
glDisable(GL_TEXTURE_2D);
glEnable(GL_DEPTH_TEST);