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

whois check for admin role (some redundancy now), commenting the interesting but unused lss code (to avoid a annoying warning about '>' bool comparison), and transparency for vote icons (again, thanks for Kirin for the help)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5290 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-07-05 19:26:08 +00:00
parent 15e9274e27
commit 03a994ee9b
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+13 -10
View File
@@ -7,7 +7,13 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t
if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts);
}
VARP(equiptransparency, 0, 1, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection
VARP(transparency, 0, 1, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection
inline void turn_on_transparency()
{
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4ub(255, 255, 255, 255);
}
void drawequipicon(float x, float y, int col, int row, float blend)
{
@@ -15,14 +21,10 @@ void drawequipicon(float x, float y, int col, int row, float blend)
if(!tex) tex = textureload("packages/misc/items.png", 4);
if(tex)
{
if(blend||equiptransparency) glEnable(GL_BLEND);
if(equiptransparency)
{
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4ub(255, 255, 255, 255);
}
if(blend||transparency) glEnable(GL_BLEND);
if(transparency) turn_on_transparency();
drawicon(tex, x, y, 120, col, row, 1/4.0f);
if(blend||equiptransparency) glDisable(GL_BLEND);
if(blend||transparency) glDisable(GL_BLEND);
}
}
@@ -64,9 +66,10 @@ void drawvoteicon(float x, float y, int col, int row, bool noblend)
if(!tex) tex = textureload("packages/misc/voteicons.png", 3);
if(tex)
{
if(noblend) glDisable(GL_BLEND);
if(noblend||transparency) glDisable(GL_BLEND);
if(transparency) turn_on_transparency();
drawicon(tex, x, y, 240, col, row, 1/2.0f);
if(noblend) glEnable(GL_BLEND);
if(noblend||transparency) glEnable(GL_BLEND);
}
}