diff --git a/src/thingdef/thingdef.h b/src/thingdef/thingdef.h index b32a15b02..a7de7285d 100644 --- a/src/thingdef/thingdef.h +++ b/src/thingdef/thingdef.h @@ -363,7 +363,6 @@ int MatchString (const char *in, const char **strings); struct StateCallData { FState *State; - AActor *Item; bool Result; }; diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp index a47e1e067..14361d597 100644 --- a/src/thingdef/thingdef_codeptr.cpp +++ b/src/thingdef/thingdef_codeptr.cpp @@ -100,7 +100,6 @@ bool ACustomInventory::CallStateChain (AActor *actor, FState * State) bool result = false; int counter = 0; - StateCall.Item = this; while (State != NULL) { // Assume success. The code pointer will set this to false if necessary @@ -2618,6 +2617,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckFloor) // A_CheckCeiling // [GZ] Totally copied on A_CheckFloor, jumps if actor touches ceiling // + //=========================================================================== DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckCeiling) { @@ -4192,6 +4192,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Warp) //========================================================================== // // ACS_Named* stuff + // // These are exactly like their un-named line special equivalents, except // they take strings instead of integers to indicate which script to run.