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

Renamed GetProximity to CountProximity. 

# Conflicts:
#	wadsrc/static/actors/actor.txt
This commit is contained in:
Major Cooke 2016-07-29 13:07:26 -05:00 committed by Christoph Oelckers
parent 167cb28563
commit 13fa06fe7a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/thingdef/thingdef_codeptr.cpp
View File

@ -645,13 +645,13 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, GetPlayerInput)
//==========================================================================
//
// GetProximity
// CountProximity
//
// NON-ACTION function of A_CheckProximity that returns how much it counts.
// Takes a pointer as anyone may or may not be a player.
//==========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, GetProximity)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, CountProximity)
{
if (numret > 0)
{

2
wadsrc/static/actors/actor.txt
View File

@ -50,7 +50,7 @@ ACTOR Actor native //: Thinker
native float GetCrouchFactor(int ptr = AAPTR_PLAYER1);
native float GetCVar(string cvar);
native int GetPlayerInput(int inputnum, int ptr = AAPTR_DEFAULT);
native int GetProximity(class<Actor> classname, float distance, int flags = 0, int ptr = AAPTR_DEFAULT);
native int CountProximity(class<Actor> classname, float distance, int flags = 0, int ptr = AAPTR_DEFAULT);
native float GetSpriteAngle(int ptr = AAPTR_DEFAULT);
native float GetSpriteRotation(int ptr = AAPTR_DEFAULT);