zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Undid the 'Spray' state change because it obviously can't work with the default blood actor.

Browse source 
SVN r3582 (trunk)
This commit is contained in:
Christoph Oelckers 2012-04-22 07:32:09 +00:00
parent aa7464df66
commit fdefd361e6
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/p_mobj.cpp
View file

@ -4658,22 +4658,19 @@ void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, angle_t dir, int damage, AAc
th->Translation = TRANSLATION(TRANSLATION_Blood, bloodcolor.a);
}
FState *state = th->FindState(NAME_Spray);
if (state != NULL)
{
if (damage > 13)
{
th->SetState (state);
}
else if (gameinfo.gametype == GAME_Strife) // this modification is Strife-specific.
{
damage += 2;
}
}
// Moved out of the blood actor so that replacing blood is easier
if (gameinfo.gametype & GAME_DoomStrifeChex)
{
FState *state = th->FindState(NAME_Spray);
if (gameinfo.gametype == GAME_Strife)
{
if (damage > 13)
{
FState *state = th->FindState(NAME_Spray);
if (state != NULL) th->SetState (state);
}
else damage += 2;
}
int advance = 0;
if (damage <= 12 && damage >= 9)
{
@ -4694,7 +4691,7 @@ void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, angle_t dir, int damage, AAc
for (; advance > 0; --advance)
{
// [RH] Do not set to a state we do not own.
if (ai->OwnsState(th->SpawnState + advance))
if (!ai->OwnsState(th->SpawnState + advance))
{
th->SetState(th->SpawnState + advance);
goto statedone;