diff options
| author | James Haley | 2010-09-26 06:26:50 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-26 06:26:50 +0000 |
| commit | 2f326ebddc4f4de18909b557fa69fe74ac849e82 (patch) | |
| tree | da193613e54c47df599208e2c59ba45cf48f1c64 /src/strife/p_inter.c | |
| parent | e9e7b85ab932b70caea5c1f7a40561f36c953d32 (diff) | |
| download | chocolate-doom-2f326ebddc4f4de18909b557fa69fe74ac849e82.tar.gz chocolate-doom-2f326ebddc4f4de18909b557fa69fe74ac849e82.tar.bz2 chocolate-doom-2f326ebddc4f4de18909b557fa69fe74ac849e82.zip | |
Identified quest #7 (killed Blue Acolytes), fixed a bug in P_SpawnMobj
(Strife doesn't withhold mobj->reactioncount in skill 5), added static
line specials 142, 143, and 149 for vertical texture scrolling, and made
note of a bug with Irale's door line type.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2142
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 15 |
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) |