diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index e152eb85..1ac8da92 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -646,6 +646,8 @@ void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local) lasthit = lastmillis; } + damageeffect(damage, pl); + if(local) damage = pl->dodamage(damage); else if(actor==player1) return; @@ -655,7 +657,6 @@ void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local) damageblend(damage); pl->damageroll(damage); } - damageeffect(damage, pl); if(pl->health<=0) { if(local) dokill(pl, actor, gib, actor->weaponsel->type); } else if(pl==player1) audiomgr.playsound(S_PAIN6, SP_HIGH); diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 036c1561..e2cb8fc8 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -368,7 +368,7 @@ void hit(int damage, playerent *d, playerent *at, const vec &vel, int gun, bool else { h.dir = ivec(int(vel.x*DNF), int(vel.y*DNF), int(vel.z*DNF)); - damageeffect(damage, d); +// damageeffect(damage, d); audiomgr.playsound(S_PAIN1+rnd(5), d); } }