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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1204 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-08-07 14:36:40 +00:00
parent 006396f099
commit 53a31e55c5
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/renderhud.cpp
-3
View File
@@ -56,8 +56,6 @@ VAR(showmap, 0, 0, 1);
void drawscope()
{
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.9f);
static Texture *scopetex = NULL;
if(!scopetex) scopetex = textureload("packages/misc/scope.png");
glBindTexture(GL_TEXTURE_2D, scopetex->id);
@@ -70,7 +68,6 @@ void drawscope()
glTexCoord2i(0, 1); glVertex2i(0, VIRTH);
glEnd();
glDisable(GL_ALPHA_TEST);
}
void drawcrosshair(bool showteamwarning)
source/src/renderparticles.cpp
+2 -2
View File
@@ -255,12 +255,12 @@ static struct parttype { int type; float r, g, b; int gr, tex; float sz; } partt
{ 0, 0.4f, 0.4f, 0.4f, 2, 0, 0.06f }, // yellow: sparks
{ 0, 1.0f, 1.0f, 1.0f, 20, 1, 0.15f }, // grey: small smoke
{ 0, 0.2f, 0.2f, 1.0f, 20, 0, 0.08f }, // blue: edit mode entities
{ PT_BLOOD, 0.4f, 0.0f, 0.0f, 1, 4, 0.3f }, // red: blood spats
{ PT_BLOOD, 0.5f, 0.0f, 0.0f, 1, 4, 0.3f }, // red: blood spats
{ 0, 1.0f, 0.1f, 0.1f, 0, 1, 0.2f }, // red: demotrack
{ PT_FIREBALL, 1.0f, 0.5f, 0.5f, 0, 2, 7.0f }, // explosion fireball
{ PT_SHOTLINE, 1.0f, 1.0f, 0.7f, 0, -1, 0.0f }, // yellow: shotline
{ PT_DECAL, 1.0f, 1.0f, 1.0f, 0, 3, 0.1f }, // hole decal
{ PT_STAIN, 0.4f, 0.0f, 0.0f, 0, 4, 0.6f }, // red: blood stain
{ PT_STAIN, 0.5f, 0.0f, 0.0f, 0, 4, 0.6f }, // red: blood stain
{ PT_DECAL, 1.0f, 1.0f, 1.0f, 0, 5, 1.5f }, // scorch decal
};