From ae21fa45620d4f8e7208728f06659b0c8eba6b92 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 8 Aug 2009 22:52:58 +0000 Subject: [PATCH] - Changed the return value of SetActivatorToTarget to match the description in the wiki. SVN r1764 (trunk) --- docs/rh-log.txt | 6 +++++- src/p_acs.cpp | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index e2456dc82..cef2558a7 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,8 @@ -August 7, 2009 +August 8, 2009 +- Changed the return value of SetActivatorToTarget to match the description + in the wiki. + +August 7, 2009 - If SetActivatorToTarget is used for a player-run script, and the player is alive, it now sets the activator to the actor the player is aiming at. I also noticed that this looked like it was a quick copy'n'paste job from diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 507aa9f45..fe5111c80 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -2951,8 +2951,9 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args) if (actor != NULL) { activator = actor; + return 1; } - return activator != NULL; + return 0; case ACSF_GetActorViewHeight: actor = SingleActorFromTID(args[0], NULL);