yquake2/zaero
0
0
Fork 0
mirror of https://github.com/yquake2/zaero.git synced 2024-11-21 19:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixt einen Crash beim Benutzen der lasergranaten

Browse source
This commit is contained in:
Yamagi Burmeister 2009-10-08 15:56:19 +00:00
parent 4a9bfc2cf3
commit 179cd6b1d0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/g_combat.c
View file

@ -252,7 +252,7 @@ static int CheckPowerArmor (edict_t *ent, vec3_t point, vec3_t normal, int damag
if (client)
client->pers.inventory[index] -= power_used;
else
else if (ent->svflags & SVF_MONSTER)
ent->monsterinfo.power_armor_power -= power_used;
return save;
}
@ -521,8 +521,10 @@ void T_Damage (edict_t *targ, edict_t *inflictor, edict_t *attacker, vec3_t dir,
SpawnDamage (te_sparks, point, normal, take);
targ->health = targ->health - take;
if (targ->takedamage != DAMAGE_IMMORTAL)
targ->health = targ->health - take;
// kill the entity
if (targ->health <= 0)
{
if ((targ->svflags & SVF_MONSTER) || (client))