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

fix item position for 4x3 screens, fix message in coop, fix default to sendmap to server...

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5605 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-08-12 02:06:46 +00:00
parent 04eaffb33a
commit 785e4f2ae0
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+4 -6
View File
@@ -268,8 +268,6 @@ void drawdmgindicator()
glEnable(GL_TEXTURE_2D);
}
VARP(xpos1, 0, 1700, 3000); // REMOVE
void drawequipicons(playerent *p)
{
glDisable(GL_BLEND);
@@ -277,9 +275,9 @@ void drawequipicons(playerent *p)
glColor4f(1.0f, 1.0f, 1.0f, 0.2f+(sinf(lastmillis/100.0f)+1.0f)/2.0f);
// health & armor
if(p->armour) drawequipicon(620, 1650, (p->armour-1)/25, 2, false);
if(p->armour) drawequipicon(560, 1650, (p->armour-1)/25, 2, false);
drawequipicon(20, 1650, 2, 3, (p->state!=CS_DEAD && p->health<=20 && !m_osok));
if(p->mag[GUN_GRENADE]) drawequipicon(xpos1, 1650, 3, 1, false);
if(p->mag[GUN_GRENADE]) drawequipicon(1520, 1650, 3, 1, false);
// weapons
int c = p->weaponsel->type != GUN_GRENADE ? p->weaponsel->type : p->prevweaponsel->type, r = 0;
@@ -287,7 +285,7 @@ void drawequipicons(playerent *p)
if(c>3) { c -= 4; r = 1; }
if(p->weaponsel && p->weaponsel->type>=GUN_KNIFE && p->weaponsel->type<NUMGUNS)
drawequipicon(1220, 1650, c, r, (!p->weaponsel->mag && p->weaponsel->type != GUN_KNIFE && p->weaponsel->type != GUN_GRENADE));
drawequipicon(1020, 1650, c, r, (!p->weaponsel->mag && p->weaponsel->type != GUN_KNIFE && p->weaponsel->type != GUN_GRENADE));
glEnable(GL_BLEND);
}
@@ -921,7 +919,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
{
pushfont("huddigits");
draw_textf("%d", 90, 823, p->health);
if(p->armour) draw_textf("%d", 390, 823, p->armour);
if(p->armour) draw_textf("%d", 360, 823, p->armour);
if(p->weaponsel && p->weaponsel->type>=GUN_KNIFE && p->weaponsel->type<NUMGUNS)
{
glMatrixMode(GL_MODELVIEW);