fabs/taqin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

check internal state in _input()

Browse source
This commit is contained in:
Fabien Freling 2020-02-19 13:40:05 +01:00
parent 7b25ae028b
commit 23ca5db700
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GameState.gd
View file

@ -19,6 +19,8 @@ func current_state_name() -> String:
return State.keys()[current_state] return State.keys()[current_state]
func transition_to(state): func transition_to(state):
if current_state == state:
return
assert(state in transitions[current_state]) assert(state in transitions[current_state])
var previous_state = current_state var previous_state = current_state
current_state = state current_state = state

12
src/Taquin.gd
View file

@ -87,6 +87,13 @@ func _ready() -> void:
shuffle(difficulty) shuffle(difficulty)
func _process(delta): func _process(delta):
pass
func _input(event):
if $AnimationPlayer.is_playing():
# Disable input during animation
return
var game_state = get_node_or_null("/root/Main/GameState") as GameState var game_state = get_node_or_null("/root/Main/GameState") as GameState
if game_state != null: if game_state != null:
match game_state.current_state: match game_state.current_state:
@ -97,11 +104,6 @@ func _process(delta):
GameState.State.GAME_OVER: GameState.State.GAME_OVER:
return return
func _input(event):
if $AnimationPlayer.is_playing():
# Disable input during animation
return
# #
# Handle keyboard input # Handle keyboard input
# #