Clean up asserts

3 files changed, 6 insertions, 14 deletions

diff --git a/player.gd b/player.gd
index 3e6850c..ec4136f 100644
--- a/player.gd
+++ b/player.gd
@@ -50,12 +50,8 @@ func get_facing() -> int:
 func handle_action_input():
 	var hooks = get_tree().get_nodes_in_group("hook_hanging")
 	for hook_any in hooks:
-		if not hook_any is HookHanging:
-			print_debug("hook is not HookHanging!", hook_any)
-			continue
-
+		assert(hook_any is HookHanging, "hook is not a Hook")
 		var hook: HookHanging = hook_any
 		var dist = (hook.global_position - global_position).length()
-		#print_debug("found hook: ", hook, ", dist: ", dist)
 		if dist < hook_distance_max:
 			request_state_hanging(hook, hook.hang_distance)
diff --git a/ps_hanging.gd b/ps_hanging.gd
index 50bd6b1..3848da4 100644
--- a/ps_hanging.gd
+++ b/ps_hanging.gd
@@ -54,7 +54,7 @@ func _handle_physics(delta: float):
 		S.MLEMING:	 _mlem(delta)
 		S.TRAVELING: _travel(delta)
 		S.HANGING:   _hang(delta)
-		_: print_debug("_handle_physics: unknown state %s" % str(state))
+		_: assert(false, "unknown state %s" % str(state))
 		
 func _mlem(delta: float):
 	t += delta
diff --git a/transition_player.gd b/transition_player.gd
index 0d35dc7..f959183 100644
--- a/transition_player.gd
+++ b/transition_player.gd
@@ -5,13 +5,12 @@ var _transition_room: Node
 var _transition_door_name: Variant # String or null
 
 func room_transition(from_door: Door, to_room_path: String, door_name: Variant):
-	print_debug("to_room_path: %s" % to_room_path)
+	print_debug("Transitioning to room path: %s" % to_room_path)
 
 	var top: Top = get_tree().root.get_node("Top")
+
 	# Do not transition if there is already a transition in process
-	if _transition_room != null:
-		#print_debug("Tried to transition to ", room_name, " but a transition was already in process")
-		return
+	if _transition_room != null: return
 
 	if from_door:
 		var player: Player = top.get_node("ActiveRoom").find_child("Player")
@@ -31,8 +30,7 @@ func room_transition(from_door: Door, to_room_path: String, door_name: Variant):
 
 func _transition_start():
 	var top: Top = get_tree().root.get_node("Top")
-	#print_debug("_transition_start")
-	
+
 	# If the room hasn't loaded yet, loop until it is
 	while _transition_room == null:
 		await get_tree().create_timer(0.1).timeout
@@ -42,7 +40,6 @@ func _transition_start():
 	
 func _on_room_changed():
 	var top: Top = get_tree().root.get_node("Top")
-	#print_debug("_on_room_changed")
 	var room = top.get_node("ActiveRoom")
 	var player: Player = room.find_child("Player")
 	if _transition_door_name:
@@ -55,7 +52,6 @@ func _on_room_changed():
 	
 func _transition_end():
 	var top: Top = get_tree().root.get_node("Top")
-	#print_debug("_transition_end")
 	_transition_room = null
 	_transition_door_name = null