summaryrefslogtreecommitdiff
path: root/src/strife/p_inter.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife/p_inter.c')
-rw-r--r--src/strife/p_inter.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
index 25917e5f..cddd097c 100644
--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -173,6 +173,7 @@ boolean P_GiveWeapon(player_t* player, weapontype_t weapon, boolean dropped)
gaveweapon = true;
player->weaponowned[weapon] = true;
+ // Alternate "sister" weapons that you also get as a bonus:
switch(weapon)
{
case wp_elecbow:
@@ -1152,7 +1153,7 @@ void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage)
// villsa [STRIFE] handle fieldguard damage
if(target->type == MT_FIELDGUARD)
{
- // degin ores are only allowed to damage the fieldguard
+ // degnin ores are only allowed to damage the fieldguard
if(!inflictor || inflictor->type != MT_DEGNINORE)
return;
@@ -1215,12 +1216,12 @@ void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage)
// villsa [STRIFE] flame attacks don't damage player if wearing envirosuit??
if(player->powers[pw_ironfeet] && inflictor)
{
- if(inflictor->type == MT_SFIREBALL
- || inflictor->type == MT_C_FLAME
- || inflictor->type == MT_PFLAME)
- {
- damage = 0;
- }
+ if(inflictor->type == MT_SFIREBALL ||
+ inflictor->type == MT_C_FLAME ||
+ inflictor->type == MT_PFLAME)
+ {
+ damage = 0;
+ }
}
if(player->armortype)