mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
expand setMoveTrigger to take true or false
have aiplayer actually use it give a copy to AIController
This commit is contained in:
parent
61a75ada1e
commit
63e3632d00
2 changed files with 13 additions and 3 deletions
|
|
@ -346,6 +346,16 @@ void AIController::TriggerState::setMoveTrigger(U32 slot, const bool isSet)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DefineEngineMethod(AIController, setMoveTrigger, void, (U32 slot, bool state), (true),
|
||||||
|
"@brief Sets a movement trigger on an AI object.\n\n"
|
||||||
|
"@param slot The trigger slot to set.\n"
|
||||||
|
"@see getMoveTrigger()\n"
|
||||||
|
"@see clearMoveTrigger()\n"
|
||||||
|
"@see clearMoveTriggers()\n")
|
||||||
|
{
|
||||||
|
object->mTriggerState.setMoveTrigger(slot, state);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the state of a movement trigger.
|
* Get the state of a movement trigger.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -621,7 +621,7 @@ bool AIPlayer::getAIMove(Move *movePtr)
|
||||||
// Replicate the trigger state into the move so that
|
// Replicate the trigger state into the move so that
|
||||||
// triggers can be controlled from scripts.
|
// triggers can be controlled from scripts.
|
||||||
for( U32 i = 0; i < MaxTriggerKeys; i++ )
|
for( U32 i = 0; i < MaxTriggerKeys; i++ )
|
||||||
movePtr->trigger[ i ] = getImageTriggerState( i );
|
movePtr->trigger[ i ] = getMoveTrigger( i );
|
||||||
|
|
||||||
#ifdef TORQUE_NAVIGATION_ENABLED
|
#ifdef TORQUE_NAVIGATION_ENABLED
|
||||||
if(mJump == Now)
|
if(mJump == Now)
|
||||||
|
|
@ -1390,14 +1390,14 @@ DefineEngineMethod(AIPlayer, checkInFoV, bool, (ShapeBase* obj, F32 fov, bool ch
|
||||||
return object->checkInFoV(obj, fov, checkEnabled);
|
return object->checkInFoV(obj, fov, checkEnabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
DefineEngineMethod( AIPlayer, setMoveTrigger, void, ( U32 slot ),,
|
DefineEngineMethod( AIPlayer, setMoveTrigger, void, ( U32 slot, bool state ),(true),
|
||||||
"@brief Sets a movement trigger on an AI object.\n\n"
|
"@brief Sets a movement trigger on an AI object.\n\n"
|
||||||
"@param slot The trigger slot to set.\n"
|
"@param slot The trigger slot to set.\n"
|
||||||
"@see getMoveTrigger()\n"
|
"@see getMoveTrigger()\n"
|
||||||
"@see clearMoveTrigger()\n"
|
"@see clearMoveTrigger()\n"
|
||||||
"@see clearMoveTriggers()\n")
|
"@see clearMoveTriggers()\n")
|
||||||
{
|
{
|
||||||
object->setMoveTrigger( slot, true );
|
object->setMoveTrigger( slot, state );
|
||||||
}
|
}
|
||||||
|
|
||||||
DefineEngineMethod( AIPlayer, clearMoveTrigger, void, ( U32 slot ),,
|
DefineEngineMethod( AIPlayer, clearMoveTrigger, void, ( U32 slot ),,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue