zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- added Demolisher's APROP_Target/TracerTID submission. 

SVN r2793 (trunk)
This commit is contained in:
Christoph Oelckers 2010-09-16 07:00:27 +00:00
parent 3662bf8a15
commit 916d4809a9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/p_acs.cpp
View File

@ -2547,6 +2547,8 @@ enum
APROP_Notrigger = 23, APROP_Notrigger = 23,
APROP_DamageFactor = 24, APROP_DamageFactor = 24,
APROP_MasterTID = 25, APROP_MasterTID = 25,
APROP_TargetTID = 26,
APROP_TracerTID = 27
}; };
// These are needed for ACS's APROP_RenderStyle // These are needed for ACS's APROP_RenderStyle
@ -2786,6 +2788,8 @@ int DLevelScript::GetActorProperty (int tid, int property)
} }
case APROP_Score: return actor->Score; case APROP_Score: return actor->Score;
case APROP_MasterTID: return DoGetMasterTID (actor); case APROP_MasterTID: return DoGetMasterTID (actor);
case APROP_TargetTID: return (actor->target != NULL) actor->target->tid : 0;
case APROP_TracerTID: return (actor->tracer != NULL) actor->tracer->tid : 0;
default: return 0; default: return 0;
} }
} }
@ -2817,6 +2821,8 @@ int DLevelScript::CheckActorProperty (int tid, int property, int value)
case APROP_JumpZ: case APROP_JumpZ:
case APROP_Score: case APROP_Score:
case APROP_MasterTID: case APROP_MasterTID:
case APROP_TargetTID:
case APROP_TracerTID:
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