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

Armor icon hud, and blocking too much open maps

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4937 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-05-19 20:31:15 +00:00
parent b6d4722032
commit be1d72d7cc
8 changed files with 97 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+2 -2
View File
@@ -10,7 +10,7 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t
void drawequipicon(float x, float y, int col, int row, float blend)
{
static Texture *tex = NULL;
if(!tex) tex = textureload("packages/misc/items-tmp.png", 4);
if(!tex) tex = textureload("packages/misc/items.png", 4);
if(tex)
{
if(blend) glEnable(GL_BLEND);
@@ -268,7 +268,7 @@ 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, 3, 3, false);
if(p->armour) drawequipicon(620, 1650, (p->armour-1)/25, 2, false);
drawequipicon(20, 1650, 2, 3, (p->state!=CS_DEAD && p->health<=20 && !m_osok));
// weapons