no musicvol reset on mapend, correct music fading, xhair alphablending
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2235 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -122,10 +122,11 @@ COMMAND(loadcrosshair, ARG_1STR);
|
||||
|
||||
void drawcrosshair(playerent *p, bool showteamwarning)
|
||||
{
|
||||
glBlendFunc(GL_ONE, GL_ONE);
|
||||
static Texture *teammatetex = NULL;
|
||||
if(!teammatetex) teammatetex = textureload("packages/misc/teammate.png");
|
||||
if(!crosshair) crosshair = textureload("packages/misc/crosshairs/default.png");
|
||||
if(crosshair->bpp==32) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
else glBlendFunc(GL_ONE, GL_ONE);
|
||||
glBindTexture(GL_TEXTURE_2D, showteamwarning ? teammatetex->id : crosshair->id);
|
||||
glBegin(GL_QUADS);
|
||||
glColor3ub(255,255,255);
|
||||
|
||||
Reference in New Issue
Block a user