From 1ecc048441681c52cd63baabf4335b51f65b2768 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Thu, 30 Apr 2015 08:28:41 -0500 Subject: [PATCH] - Change the pointer to be at the end instead of the start. --- src/thingdef/thingdef_codeptr.cpp | 12 ++++++------ wadsrc/static/actors/actor.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp index 722cae8ce..21dc93036 100644 --- a/src/thingdef/thingdef_codeptr.cpp +++ b/src/thingdef/thingdef_codeptr.cpp @@ -5858,12 +5858,12 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ResetHealth) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIfHigherOrLower) { ACTION_PARAM_START(6); - ACTION_PARAM_INT(ptr, 0); - ACTION_PARAM_STATE(high, 1); - ACTION_PARAM_STATE(low, 2); - ACTION_PARAM_FIXED(offsethigh, 3); - ACTION_PARAM_FIXED(offsetlow, 4); - ACTION_PARAM_BOOL(includeHeight, 5); + ACTION_PARAM_STATE(high, 0); + ACTION_PARAM_STATE(low, 1); + ACTION_PARAM_FIXED(offsethigh, 2); + ACTION_PARAM_FIXED(offsetlow, 3); + ACTION_PARAM_BOOL(includeHeight, 4); + ACTION_PARAM_INT(ptr, 5); AActor *mobj = COPY_AAPTR(self, ptr); diff --git a/wadsrc/static/actors/actor.txt b/wadsrc/static/actors/actor.txt index 25e5ab1b5..b7fea4189 100644 --- a/wadsrc/static/actors/actor.txt +++ b/wadsrc/static/actors/actor.txt @@ -330,7 +330,7 @@ ACTOR Actor native //: Thinker action native A_SetFloatBobPhase(int bob); action native A_SetHealth(int health, int ptr = AAPTR_DEFAULT); action native A_ResetHealth(int ptr = AAPTR_DEFAULT); - action native A_JumpIfHigherOrLower(int ptr = AAPTR_TARGET, state high, state low, float offsethigh = 0, float offsetlow = 0, bool includeHeight = true); + action native A_JumpIfHigherOrLower(state high, state low, float offsethigh = 0, float offsetlow = 0, bool includeHeight = true, int ptr = AAPTR_TARGET); action native A_SetRipperLevel(int level); action native A_SetRipMin(int min); action native A_SetRipMax(int max);