diff --git a/source/src/renderparticles.cpp b/source/src/renderparticles.cpp index 9f23f381..908156cb 100644 --- a/source/src/renderparticles.cpp +++ b/source/src/renderparticles.cpp @@ -254,7 +254,7 @@ 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.5f, 0.0f, 0.0f, 1, 4, 0.4f }, // 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 diff --git a/source/src/tools.h b/source/src/tools.h index 62eb238d..8861e201 100644 --- a/source/src/tools.h +++ b/source/src/tools.h @@ -32,6 +32,7 @@ typedef unsigned int uint; #define rnd(max) (rand()%(max)) #define rndreset() (srand(1)) #define rndtime() { loopi(lastmillis&0xF) rnd(i+1); } +#define detrnd(s, x) ((int)(((((uint)(s))*1103515245+12345)>>16)%(x))) #define loop(v,m) for(int v = 0; vlifesequence); playsound(S_PAIN1+rnd(5), &d->o); } - particle_splash(3, damage, 1000, d->o); + particle_splash(3, damage/10, 1000, d->o); demodamage(damage, d->o); }