zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added Thomas's submissions for decal assignment to puffs and NOINFIGHTING flag.

Browse source 
SVN r847 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-24 22:06:26 +00:00
parent 7e900c1016
commit 1e81eb0fee
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
March 24, 2008 (Changes by Graf Zahl)
- Added Thomas's submissions for decal assignment to puffs and NOINFIGHTING flag.
- Reverted changes of r715 in v_collection.cpp because they broke loading
of status bar face graphics belonging to skins.
SBARINFO update #15

5
src/p_interaction.cpp
View file

@ -1270,8 +1270,9 @@ bool AActor::OkayToSwitchTarget (AActor *other)
}
int infight;
if (level.flags & LEVEL_TOTALINFIGHTING) infight=1;
else if (level.flags & LEVEL_NOINFIGHTING) infight=-1;
if (flags5 & MF5_NOINFIGHTING) infight=-1;
else if (level.flags & LEVEL_TOTALINFIGHTING) infight=1;
else if (level.flags & LEVEL_NOINFIGHTING) infight=-1;
else infight = infighting;
if (infight < 0 && other->player == NULL && !IsHostile (other))

20
src/p_map.cpp
View file

@ -2877,8 +2877,24 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
// [RH] Spawn a decal
if (trace.HitType == TRACE_HitWall && trace.Line->special != Line_Horizon)
{
SpawnShootDecal (t1, trace);
{
// [TN] If the actor or weapon has a decal defined, use that one.
if(t1->DecalGenerator != NULL ||
(t1->player != NULL && t1->player->ReadyWeapon != NULL && t1->player->ReadyWeapon->DecalGenerator != NULL))
{
SpawnShootDecal (t1, trace);
}
// Else, look if the bulletpuff has a decal defined.
else if(puff != NULL && puff->DecalGenerator)
{
SpawnShootDecal (puff, trace);
}
else
{
SpawnShootDecal (t1, trace);
}
}
else if (puff != NULL &&
trace.CrossedWater == NULL &&