UPBGE: Fix duplication of action actuator.

Before the action actuator a member m_lastUpdate was used in the
update process of the actuator, when the actuator was duplicated
this member was set to -1 as for the constructor of the actuator.
The refactor removed this member because it was redundant, but
nothing compensated it during the duplication of the actuator.
To do so the flag of the actuator is reset to 0 excepted for
continue flag, as again the actuator constructor.

In the same time unused members of the action actuator were removed
and the python attribute blendTime which was inffective since BFBGE
was removed.

Author: panzergame

doc/python_api/rst/bge_types/bge.types.BL_ActionActuator.rst

@@ -51,12 +51,6 @@ base class --- :class:`SCA_IActuator`
 
       :type: string
 
-   .. attribute:: blendTime
-
-      Sets the internal frame timer. This property must be in the range from 0.0 to blendIn.
-
-      :type: float
-
    .. attribute:: mode
 
       The operation mode of the actuator. Can be one of :ref:`these constants<action-actuator>`.

source/blender/makesdna/DNA_actuator_types.h

@@ -60,8 +60,8 @@ typedef struct bActionActuator {
 	short   end_reset;      /* Ending the actuator (negative pulse) wont reset the action to its starting frame */
 	short   strideaxis;     /* Displacement axis */
 	short   blend_mode;		/* Layer blending mode */
-	float   stridelength;   /* Displacement incurred by cycle */ // not in use
 	float   layer_weight;   /* How much of the previous layer to use for blending. (<0 = disable, 0 = add mode) */
+	int pad;
 } bActionActuator;
 
 typedef struct Sound3D {

source/gameengine/Converter/BL_ActionActuator.cpp

@@ -72,17 +72,13 @@ BL_ActionActuator::BL_ActionActuator(SCA_IObject *gameobj,
 					short	layer,
 					float	layer_weight,
 					short	ipo_flags,
-					short	end_reset,
-					float	stride) 
-	: SCA_IActuator(gameobj, KX_ACT_ACTION),
-	m_blendframe(0),
+					short	end_reset)
+	:SCA_IActuator(gameobj, KX_ACT_ACTION),
 	m_flag(0),
-	m_startframe (starttime),
+	m_startframe(starttime),
 	m_endframe(endtime) ,
 	m_localtime(starttime),
 	m_blendin(blendin),
-	m_blendstart(0),
-	m_stridelength(stride),
 	m_layer_weight(layer_weight),
 	m_playtype(playtype),
 	m_blendmode(blend_mode),
@@ -105,7 +101,8 @@ void BL_ActionActuator::ProcessReplica()
 {
 	SCA_IActuator::ProcessReplica();
 
-	m_localtime = m_startframe;	
+	m_flag = m_flag & ACT_FLAG_CONTINUE;
+	m_localtime = m_startframe;
 }
 
 EXP_Value* BL_ActionActuator::GetReplica()
@@ -332,7 +329,6 @@ PyAttributeDef BL_ActionActuator::Attributes[] = {
 	EXP_PYATTRIBUTE_STRING_RW("propName", 0, MAX_PROP_NAME, false, BL_ActionActuator, m_propname),
 	EXP_PYATTRIBUTE_STRING_RW("framePropName", 0, MAX_PROP_NAME, false, BL_ActionActuator, m_framepropname),
 	EXP_PYATTRIBUTE_RW_FUNCTION("useContinue", BL_ActionActuator, pyattr_get_use_continue, pyattr_set_use_continue),
-	EXP_PYATTRIBUTE_FLOAT_RW_CHECK("blendTime", 0, MAXFRAMEF, BL_ActionActuator, m_blendframe, CheckBlendTime),
 	EXP_PYATTRIBUTE_SHORT_RW_CHECK("mode",0,100,false,BL_ActionActuator,m_playtype,CheckType),
 	EXP_PYATTRIBUTE_NULL //Sentinel
 };

source/gameengine/Converter/BL_ActionActuator.h

@@ -53,8 +53,7 @@ class BL_ActionActuator : public SCA_IActuator
 						short	layer,
 						float	layer_weight,
 						short	ipo_flags,
-						short	end_reset,
-						float	stride);
+						short	end_reset);
 
 	virtual ~BL_ActionActuator();
 	virtual	bool Update(double curtime);
@@ -80,16 +79,6 @@ class BL_ActionActuator : public SCA_IActuator
 	static PyObject*	pyattr_get_frame(EXP_PyObjectPlus *self_v, const EXP_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_frame(EXP_PyObjectPlus *self_v, const EXP_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-	static int CheckBlendTime(EXP_PyObjectPlus *self, const PyAttributeDef*)
-	{
-		BL_ActionActuator* act = reinterpret_cast<BL_ActionActuator*>(self);
-
-		if (act->m_blendframe > act->m_blendin)
-			act->m_blendframe = act->m_blendin;
-
-		return 0;
-	}
-
 	static int CheckType(EXP_PyObjectPlus *self, const PyAttributeDef*)
 	{
 		BL_ActionActuator* act = reinterpret_cast<BL_ActionActuator*>(self);
@@ -110,19 +99,15 @@ class BL_ActionActuator : public SCA_IActuator
 #endif  /* WITH_PYTHON */
 
 protected:
-	float	m_blendframe;
 	int		m_flag;
 	/** The frame this action starts */
 	float	m_startframe;
 	/** The frame this action ends */
 	float	m_endframe;
 	/** The current time of the action */
 	float	m_localtime;
-	
-	float	m_lastUpdate;
 	float	m_blendin;
 	float	m_blendstart;
-	float	m_stridelength;
 	float	m_layer_weight;
 	short	m_playtype;
 	short   m_blendmode;

source/gameengine/Converter/BL_ConvertActuators.cpp

@@ -233,10 +233,7 @@ void BL_ConvertActuators(const char* maggiename,
 				            actact->layer,
 				            actact->layer_weight,
 				            ipo_flags,
-				            actact->end_reset,
-				            actact->stridelength
-				            // Ketsji at 1, because zero is reserved for "NoDef"
-				            );
+				            actact->end_reset);
 				baseact= tmpbaseact;
 				break;
 			}