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

- added Xaser's reactiontime for ACS and DECORATE expression patch.

Browse source 
SVN r4222 (trunk)
This commit is contained in:
Christoph Oelckers 2013-04-20 21:32:03 +00:00
parent cb64014494
commit 9f71c7cb4e
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_acs.cpp
View file

@ -2847,6 +2847,7 @@ enum
APROP_Stamina = 34, APROP_Stamina = 34,
APROP_Height = 35, APROP_Height = 35,
APROP_Radius = 36, APROP_Radius = 36,
APROP_ReactionTime = 37,
}; };
// These are needed for ACS's APROP_RenderStyle // These are needed for ACS's APROP_RenderStyle
@ -3058,6 +3059,10 @@ void DLevelScript::DoSetActorProperty (AActor *actor, int property, int value)
actor->stamina = value; actor->stamina = value;
break; break;
case APROP_ReactionTime:
actor->reactiontime = value;
break;
default: default:
// do nothing. // do nothing.
break; break;
@ -3128,6 +3133,7 @@ int DLevelScript::GetActorProperty (int tid, int property)
case APROP_Stamina: return actor->stamina; case APROP_Stamina: return actor->stamina;
case APROP_Height: return actor->height; case APROP_Height: return actor->height;
case APROP_Radius: return actor->radius; case APROP_Radius: return actor->radius;
case APROP_ReactionTime:return actor->reactiontime;
default: return 0; default: return 0;
} }
@ -3170,6 +3176,7 @@ int DLevelScript::CheckActorProperty (int tid, int property, int value)
case APROP_Stamina: case APROP_Stamina:
case APROP_Height: case APROP_Height:
case APROP_Radius: case APROP_Radius:
case APROP_ReactionTime:
return (GetActorProperty(tid, property) == value); return (GetActorProperty(tid, property) == value);
// Boolean values need to compare to a binary version of value // Boolean values need to compare to a binary version of value

1
src/thingdef/thingdef_expression.cpp
View file

@ -86,6 +86,7 @@ DEFINE_MEMBER_VARIABLE(accuracy, AActor)
DEFINE_MEMBER_VARIABLE(stamina, AActor) DEFINE_MEMBER_VARIABLE(stamina, AActor)
DEFINE_MEMBER_VARIABLE(height, AActor) DEFINE_MEMBER_VARIABLE(height, AActor)
DEFINE_MEMBER_VARIABLE(radius, AActor) DEFINE_MEMBER_VARIABLE(radius, AActor)
DEFINE_MEMBER_VARIABLE(reactiontime, AActor)
//========================================================================== //==========================================================================

1
wadsrc/static/actors/actor.txt
View file

@ -58,6 +58,7 @@ ACTOR Actor native //: Thinker
native int stamina; native int stamina;
native fixed_t height; native fixed_t height;
native fixed_t radius; native fixed_t radius;
native int reactiontime;
// Meh, MBF redundant functions. Only for DeHackEd support. // Meh, MBF redundant functions. Only for DeHackEd support.
action native A_Turn(float angle = 0); action native A_Turn(float angle = 0);