OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added two new things which can set a sector's color without the need of tags

Browse source 
or scripts. ColorSetter (#9038) sets the sector's color and FadeSetter (#9039)
  sets the fog color.
- added new flags MF5_ALWAYSFAST and MF5_NEVERFAST. These flags unconditionally
  enable or disable fast movement logic, regardless of skill settings.
- added an abstraction layer for skill related settings. This is a preparation
  for implementing custom skill definitions but right now all it does is
  returning the original values but keeping the related information all in one
  place


SVN r557 (trunk)
This commit is contained in:
Christoph Oelckers 2007-10-29 22:15:46 +00:00
commit 170b633e91
19 changed files with 185 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/p_interaction.cpp
View file

@ -687,7 +687,9 @@ void P_AutoUseHealth(player_t *player, int saveHealth)
normalAmount = normalItem != NULL ? normalItem->Amount : 0;
superAmount = superItem != NULL ? superItem->Amount : 0;
if ((gameskill == sk_baby) && (normalAmount*25 >= saveHealth))
bool skilluse = !!G_SkillProperty(SKILLP_AutoUseHealth);
if (skilluse && (normalAmount*25 >= saveHealth))
{ // Use quartz flasks
count = (saveHealth+24)/25;
for(i = 0; i < count; i++)
@ -713,7 +715,7 @@ void P_AutoUseHealth(player_t *player, int saveHealth)
}
}
}
else if ((gameskill == sk_baby)
else if (skilluse
&& (superAmount*100+normalAmount*25 >= saveHealth))
{ // Use mystic urns and quartz flasks
count = (saveHealth+24)/25;
@ -861,13 +863,10 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
return;
}
player = target->player;
if (player && gameskill == sk_baby)
if (player && damage > 1)
{
// Take half damage in trainer mode
if (damage > 1)
{
damage >>= 1;
}
damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));
}
// Special damage types
if (inflictor)
@ -1041,7 +1040,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
}
if (damage >= player->health
&& ((gameskill == sk_baby) || deathmatch)
&& (G_SkillProperty(SKILLP_AutoUseHealth) || deathmatch)
&& !player->morphTics)
{ // Try to use some inventory health
P_AutoUseHealth (player, damage - player->health + 1);
@ -1324,10 +1323,10 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage,
{ // target is invulnerable
return;
}
if (player && gameskill == sk_baby)
if (player)
{
// Take half damage in trainer mode
damage >>= 1;
damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));
}
if(damage < 1000 && ((player->cheats&CF_GODMODE)
|| (player->mo->flags2 & MF2_INVULNERABLE)))
@ -1335,7 +1334,7 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage,
return;
}
if (damage >= player->health
&& ((gameskill == sk_baby) || deathmatch)
&& (G_SkillProperty(SKILLP_AutoUseHealth) || deathmatch)
&& !player->morphTics)
{ // Try to use some inventory health
P_AutoUseHealth (player, damage - player->health+1);