mirror of
https://github.com/ZDoom/qzdoom.git
synced 2025-01-18 15:11:46 +00:00
- Quoth Gez:
* when a logical condition was rewritten and inverted, one of the boolean test wasn't inverted along the rest. So the "monster must not be a player" was accidentally changed into "monster must be a player", which is usually going to be false... There's another minor, but related issue. SVN r1948 (trunk)
This commit is contained in:
parent
aea4e38241
commit
0e5f48adb4
3 changed files with 6 additions and 2 deletions
|
@ -2545,6 +2545,10 @@ static bool P_CheckForResurrection(AActor *self, bool usevilestates)
|
|||
S_Sound (corpsehit, CHAN_BODY, "vile/raise", 1, ATTN_IDLE);
|
||||
info = corpsehit->GetDefault ();
|
||||
|
||||
if (corpsehit->state == corpsehit->FindState(NAME_GenericCrush))
|
||||
{
|
||||
corpsehit->Translation = info->Translation; // Clean up bloodcolor translation from crushed corpses
|
||||
}
|
||||
if (ib_compatflags & BCOMPATF_VILEGHOSTS)
|
||||
{
|
||||
corpsehit->height <<= 2;
|
||||
|
@ -2563,7 +2567,6 @@ static bool P_CheckForResurrection(AActor *self, bool usevilestates)
|
|||
corpsehit->RenderStyle = STYLE_Translucent;
|
||||
}
|
||||
}
|
||||
corpsehit->Translation = info->Translation; // Clean up bloodcolor translation from crushed corpses
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1018,7 +1018,7 @@ bool AActor::Grind(bool items)
|
|||
if (state == NULL // Only use the default crushed state if:
|
||||
&& !(flags & MF_NOBLOOD) // 1. the monster bleeeds,
|
||||
&& (i_compatflags & COMPATF_CORPSEGIBS) // 2. the compat setting is on,
|
||||
&& player != NULL) // 3. and the thing isn't a player.
|
||||
&& player == NULL) // 3. and the thing isn't a player.
|
||||
{
|
||||
isgeneric = true;
|
||||
state = FindState(NAME_GenericCrush);
|
||||
|
|
|
@ -86,6 +86,7 @@ F84AB4557464A383E93F37CD3A82AC48 // MM2 map03
|
|||
2EEB1E12FA9F9545DE9D99990A4A78E5 // Icarus map24
|
||||
65A53A09A09525AE42EA210BF879CD37 // Plutonia 2 map32
|
||||
2499CF9A9351BE9BC4E9C66FC9F291A7 // Requiem map23
|
||||
3CA5493FEFF2E27BFD4181E6C4A3C2BF // The Waterfront map01
|
||||
{
|
||||
corpsegibs
|
||||
vileghosts
|
||||
|
|
Loading…
Reference in a new issue