From 53a31e55c5eeea8f1963012f30f82181a2b784af Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 7 Aug 2007 14:36:40 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1204 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/renderhud.cpp | 3 --- source/src/renderparticles.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index b179c457..e1789bec 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -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) diff --git a/source/src/renderparticles.cpp b/source/src/renderparticles.cpp index a553083a..7c2cbfad 100644 --- a/source/src/renderparticles.cpp +++ b/source/src/renderparticles.cpp @@ -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 };