zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specie -> Species 

- specie: money in the form of coins rather than notes
- species: a group of living organisms consisting of similar individuals
  capable of exchanging genes or interbreeding
This commit is contained in:
Randy Heit 2014-08-07 22:40:12 -05:00
parent 75dc7de632
commit fefe6aa2c1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_map.cpp
View File

@ -3470,7 +3470,7 @@ struct Origin
{
AActor *Caller;
bool hitGhosts;
bool hitSameSpecie;
bool hitSameSpecies;
};
static ETraceStatus CheckForActor(FTraceResults &res, void *userdata)
@ -3488,7 +3488,7 @@ static ETraceStatus CheckForActor(FTraceResults &res, void *userdata)
return TRACE_Skip;
}
if (data->hitSameSpecie && res.Actor->GetSpecies() == data->Caller->GetSpecies())
if (data->hitSameSpecies && res.Actor->GetSpecies() == data->Caller->GetSpecies())
{
return TRACE_Skip;
}
@ -3517,8 +3517,6 @@ AActor *P_LineAttack(AActor *t1, angle_t angle, fixed_t distance,
TData.Caller = t1;
angle_t srcangle = angle;
int srcpitch = pitch;
bool hitGhosts;
bool hitSameSpecie;
bool killPuff = false;
AActor *puff = NULL;
int pflag = 0;
@ -3566,7 +3564,7 @@ AActor *P_LineAttack(AActor *t1, angle_t angle, fixed_t distance,
(t1->player->ReadyWeapon->flags2 & MF2_THRUGHOST)) ||
(puffDefaults && (puffDefaults->flags2 & MF2_THRUGHOST));
TData.hitSameSpecie = (puffDefaults && (puffDefaults->flags6 & MF6_MTHRUSPECIES));
TData.hitSameSpecies = (puffDefaults && (puffDefaults->flags6 & MF6_MTHRUSPECIES));
// if the puff uses a non-standard damage type, this will override default, hitscan and melee damage type.
// All other explicitly passed damage types (currenty only MDK) will be preserved.