X-Git-Url: http://git.purplebirdman.com/frog-ninja.git/blobdiff_plain/16f5fda45ed2a668758450eff052e0903d7ef3ae..47f9406a184d838e4701978a1a6f2dd871326d51:/player/model.gd

diff --git a/player/model.gd b/player/model.gd
index 05564a8..ec1a952 100644
--- a/player/model.gd
+++ b/player/model.gd
@@ -15,22 +15,24 @@ var current_move: Move
 ###
 
 func _ready() -> void:
+	# assign starting state
 	current_move = moves["idle"]
 	
-	# assign player object to each move
+	# assign objects to each move
 	for move in moves.values():
 		move.player = player
 		move.camera = camera
 
 
 func update(input: InputPacket, delta: float):
-	var relevent_move = current_move.should_enter(input)
-	if not relevent_move.is_empty():
+	var relevent_move := current_move.should_enter(input)
+	if moves[relevent_move] != current_move:
 		switch_to(relevent_move)
 	current_move.update(input, delta)
 
 
 func switch_to(state: String):
+	player.state = state
 	current_move.on_exit_state()
 	current_move = moves[state]
 	current_move.on_enter_state()