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

- added bugfix patch by Gez.

Browse source 
SVN r1663 (trunk)
This commit is contained in:
Christoph Oelckers 2009-06-10 20:14:47 +00:00
parent b458234c34
commit 870508c64a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -755,7 +755,7 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
if ((thing->flags2 | tm.thing->flags2) & MF2_THRUACTORS) if ((thing->flags2 | tm.thing->flags2) & MF2_THRUACTORS)
return true; return true;
if ((tm.thing->flags6 & MF6_THRUSPECIES) && (tm.thing->Species == thing->Species)) if ((tm.thing->flags6 & MF6_THRUSPECIES) && (tm.thing->GetSpecies() == thing->GetSpecies()))
return true; return true;
if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE)) ) if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE)) )

2
src/thingdef/thingdef_codeptr.cpp
View file

@ -535,7 +535,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIfArmorType)
ACTION_PARAM_START(3); ACTION_PARAM_START(3);
ACTION_PARAM_NAME(Type, 0); ACTION_PARAM_NAME(Type, 0);
ACTION_PARAM_STATE(JumpOffset, 1); ACTION_PARAM_STATE(JumpOffset, 1);
ACTION_PARAM_INT(amount, 1); ACTION_PARAM_INT(amount, 2);
ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains! ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!