fix: state machines now handle being disabled
This commit is contained in:
parent
707c38894a
commit
5d0ae90fbc
3 changed files with 19 additions and 1 deletions
|
|
@ -5,10 +5,12 @@ void StateMachine::_bind_methods() {}
|
|||
|
||||
void StateMachine::switch_to_state(State *state) {
|
||||
if (this->current_state != nullptr) {
|
||||
this->current_state_is_active = false;
|
||||
this->current_state->exit_state();
|
||||
}
|
||||
this->current_state = state;
|
||||
if (this->current_state != nullptr) {
|
||||
this->current_state_is_active = true;
|
||||
this->current_state->enter_state();
|
||||
} else {
|
||||
print_error("StateMachine::switch_to_state: New state is nullptr, StateMachine will now stop working");
|
||||
|
|
@ -38,6 +40,20 @@ void StateMachine::_notification(int what) {
|
|||
case NOTIFICATION_PROCESS:
|
||||
process(get_process_delta_time());
|
||||
return;
|
||||
case NOTIFICATION_DISABLED:
|
||||
case NOTIFICATION_EXIT_TREE:
|
||||
if (this->current_state_is_active && this->current_state != nullptr) {
|
||||
this->current_state_is_active = false;
|
||||
this->current_state->exit_state();
|
||||
}
|
||||
return;
|
||||
case NOTIFICATION_ENABLED:
|
||||
case NOTIFICATION_ENTER_TREE:
|
||||
if (!this->current_state_is_active && this->current_state != nullptr) {
|
||||
this->current_state_is_active = true;
|
||||
this->current_state->enter_state();
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue