From e5e0de46d3df06b43f1b2d94e552a1b771b7a6e4 Mon Sep 17 00:00:00 2001 From: driAn Date: Mon, 3 Nov 2008 19:54:40 +0000 Subject: [PATCH] show blood for local player as well git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3396 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 +- source/src/weapon.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 22faae7d..638ee0c9 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -520,7 +520,7 @@ void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local) updatedmgindicator(actor->o); pl->damageroll(damage); } - else damageeffect(damage, pl); + damageeffect(damage, pl); if(pl->health<=0) { if(local) dokill(pl, actor, gib); } else if(pl==player1) playsound(S_PAIN6, SP_HIGH); diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 10252e26..9e883a10 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -325,6 +325,7 @@ void hit(int damage, playerent *d, playerent *at, const vec &vel, int gun, bool h.dir = ivec(0, 0, 0); d->damageroll(damage); updatedmgindicator(at->o); + damageeffect(damage, d); playsound(S_PAIN6, SP_HIGH); } else