diff --git a/Templates/Empty/game/tools/shapeEditor/scripts/shapeEditor.ed.cs b/Templates/Empty/game/tools/shapeEditor/scripts/shapeEditor.ed.cs index 391e0b217..d79923776 100644 --- a/Templates/Empty/game/tools/shapeEditor/scripts/shapeEditor.ed.cs +++ b/Templates/Empty/game/tools/shapeEditor/scripts/shapeEditor.ed.cs @@ -2206,15 +2206,22 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s function ShapeEdSequences::onAddTrigger( %this ) { - // Can only add triggers if a sequence is selected - %seqName = ShapeEdSequenceList.getSelectedName(); - if ( %seqName !$= "" ) - { - // Add a new trigger at the current frame - %frame = mRound( ShapeEdSeqSlider.getValue() ); - %state = ShapeEdTriggerList.rowCount() % 30; - ShapeEditor.doAddTrigger( %seqName, %frame, %state ); - } + // Can only add triggers if a sequence is selected + %seqName = ShapeEdSequenceList.getSelectedName(); + if ( %seqName !$= "" ) + { + // Add a new trigger at the current frame + %frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText(); + if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText())) + { + MessageBoxOK( "Error", "Trigger out of range of the selected animation." ); + } + else + { + %state = ShapeEdTriggerList.rowCount() % 30; + ShapeEditor.doAddTrigger( %seqName, %frame, %state ); + } + } } function ShapeEdTriggerList::onDeleteSelection( %this ) diff --git a/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs b/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs index 391e0b217..d79923776 100644 --- a/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs +++ b/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs @@ -2206,15 +2206,22 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s function ShapeEdSequences::onAddTrigger( %this ) { - // Can only add triggers if a sequence is selected - %seqName = ShapeEdSequenceList.getSelectedName(); - if ( %seqName !$= "" ) - { - // Add a new trigger at the current frame - %frame = mRound( ShapeEdSeqSlider.getValue() ); - %state = ShapeEdTriggerList.rowCount() % 30; - ShapeEditor.doAddTrigger( %seqName, %frame, %state ); - } + // Can only add triggers if a sequence is selected + %seqName = ShapeEdSequenceList.getSelectedName(); + if ( %seqName !$= "" ) + { + // Add a new trigger at the current frame + %frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText(); + if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText())) + { + MessageBoxOK( "Error", "Trigger out of range of the selected animation." ); + } + else + { + %state = ShapeEdTriggerList.rowCount() % 30; + ShapeEditor.doAddTrigger( %seqName, %frame, %state ); + } + } } function ShapeEdTriggerList::onDeleteSelection( %this )