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

leaving out surplus and confusing VAR

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5402 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-07-17 22:23:04 +00:00
parent 527e115cfd
commit c5604e0afe
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
+6 -5
View File
@@ -7,7 +7,7 @@ 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(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
//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()
{
@@ -21,10 +21,11 @@ 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||transparency) glEnable(GL_BLEND);
if(transparency) turn_on_transparency();
//if(blend||transparency) glEnable(GL_BLEND); if(transparency)
turn_on_transparency();
drawicon(tex, x, y, 120, col, row, 1/4.0f);
if(blend||transparency) glDisable(GL_BLEND);
//if(blend||transparency)
glDisable(GL_BLEND);
}
}
@@ -67,7 +68,7 @@ void drawvoteicon(float x, float y, int col, int row, bool noblend)
if(tex)
{
if(noblend) glDisable(GL_BLEND);
if(transparency && !noblend) turn_on_transparency();
else turn_on_transparency(); // if(transparency && !noblend)
drawicon(tex, x, y, 240, col, row, 1/2.0f);
if(noblend) glEnable(GL_BLEND);
}