OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added code submissions for non-piercing railguns and new skill options.

Browse source 
SVN r1706 (trunk)
This commit is contained in:
Christoph Oelckers 2009-07-04 18:17:44 +00:00
commit 635d71e660
25 changed files with 155 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/p_interaction.cpp
View file

@ -319,19 +319,20 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker)
EXTERN_CVAR (Int, fraglimit)
static int GibHealth(AActor *actor)
{
{
return -abs(
actor->GetClass()->Meta.GetMetaInt (
AMETA_GibHealth,
gameinfo.gametype & GAME_DoomChex ?
-actor->GetDefault()->health :
-actor->GetDefault()->health/2));
-actor->SpawnHealth() :
-actor->SpawnHealth()/2));
}
void AActor::Die (AActor *source, AActor *inflictor)
{
// Handle possible unmorph on death
bool wasgibbed = (health < GibHealth(this));
AActor *realthis = NULL;
int realstyle = 0;
int realhealth = 0;
@ -1264,10 +1265,10 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
}
}
dopain:
if (!(target->flags5 & MF5_NOPAIN) && (inflictor == NULL || !(inflictor->flags5 & MF5_PAINLESS)) &&
(pr_damagemobj() < painchance || (inflictor != NULL && (inflictor->flags6 & MF6_FORCEPAIN))) &&
!(target->flags & MF_SKULLFLY))
dopain:
if (!(target->flags5 & MF5_NOPAIN) && (inflictor == NULL || !(inflictor->flags5 & MF5_PAINLESS)) &&
!G_SkillProperty(SKILLP_NoPain) && (pr_damagemobj() < painchance ||
(inflictor != NULL && (inflictor->flags6 & MF6_FORCEPAIN))) && !(target->flags & MF_SKULLFLY))
{
if (mod == NAME_Electric)
{