OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added Karate Chris's teamdamage in MAPINFO submission.

Browse source 
- Added Blzut3's second SBARINFO update.


SVN r621 (trunk)
This commit is contained in:
Christoph Oelckers 2007-12-22 22:04:20 +00:00
commit 4131ec141d
7 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_interaction.cpp
View file

@ -1025,7 +1025,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
FriendlyFire = true;
if (damage < 1000000)
{ // Still allow telefragging :-(
damage = (int)((float)damage * teamdamage);
damage = (int)((float)damage * level.teamdamage);
if (damage <= 0)
return;
}
@ -1290,7 +1290,7 @@ void P_PoisonPlayer (player_t *player, AActor *poisoner, AActor *source, int poi
}
if (source != NULL && source->player != player && player->mo->IsTeammate (source))
{
poison = (int)((float)poison * teamdamage);
poison = (int)((float)poison * level.teamdamage);
}
if (poison > 0)
{