From 13fa06fe7a4c9c3d97a89bdb43175c960f710153 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Fri, 29 Jul 2016 13:07:26 -0500 Subject: [PATCH] Renamed GetProximity to CountProximity. # Conflicts: # wadsrc/static/actors/actor.txt --- src/thingdef/thingdef_codeptr.cpp | 4 ++-- wadsrc/static/actors/actor.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp index cd90e08e56..16f9e24820 100644 --- a/src/thingdef/thingdef_codeptr.cpp +++ b/src/thingdef/thingdef_codeptr.cpp @@ -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) { diff --git a/wadsrc/static/actors/actor.txt b/wadsrc/static/actors/actor.txt index d28c8ebc3a..868925c3df 100644 --- a/wadsrc/static/actors/actor.txt +++ b/wadsrc/static/actors/actor.txt @@ -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 classname, float distance, int flags = 0, int ptr = AAPTR_DEFAULT); + native int CountProximity(class classname, float distance, int flags = 0, int ptr = AAPTR_DEFAULT); native float GetSpriteAngle(int ptr = AAPTR_DEFAULT); native float GetSpriteRotation(int ptr = AAPTR_DEFAULT);