From 10426e525b94b98cd52a1090f401aa92e814ad4c Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <x@bdero.me>
Date: Mon, 13 Jun 2016 21:37:55 -0400
Subject: [PATCH] Prefer using get_node() directly instead of get_root()

Closes #32.
---
 scenes/main.scn             | Bin 2007 -> 2006 bytes
 scripts/globals.gd          |   5 +++--
 scripts/player/cam_base.gd  |   2 +-
 scripts/player/character.gd |   4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scenes/main.scn b/scenes/main.scn
index 44c9acb7caf395d5d8bc75e18d62de477e1b5889..1de176eba2423b637260e7f52c58aabdf04e4ff4 100644
GIT binary patch
delta 73
zcmcc4e~n)?DA?JV0R#jX7#?ykFzjPzU|?imXkcVuQeb0XT)@o0qrg5<&5<Rc=K=e~
ZOao@81CJ-pJH)89IgzoDjnx^X9{?^+5mx{J

delta 74
zcmcb{f1O_~DA?JV0R#jX7#?ykFzjb%U|?imXkcVuYG7kzU{qjc;89?nsOre{fM;Ts
a0qbdp`wq+#=N@8I+nm5y$i~V5G5`Q2Nf1r|

diff --git a/scripts/globals.gd b/scripts/globals.gd
index 83d0af2..d46b074 100644
--- a/scripts/globals.gd
+++ b/scripts/globals.gd
@@ -5,6 +5,7 @@ var score = 0
 var time = 0
 var rings = 0
 
+var main_scene
 var camera
 var fade
 
@@ -22,7 +23,7 @@ func load_scene(scene_name):
 	return ResourceLoader.load("res://scenes/" + scene_name + ".scn")
 
 func _ready():
-	var main_scene = get_tree().get_root().get_node("main")
+	main_scene = get_node("/root/main")
 	
 	camera = load_scene("camera").instance()
 	main_scene.add_child(camera)
@@ -106,7 +107,7 @@ func set_scene(scene):
 	# Create an instance of our scene
 	level = s.instance()
 	# Add scene to main
-	get_tree().get_root().get_node("main/scenes").add_child(level)
+	main_scene.get_node("scenes").add_child(level)
 
 func is_character(body):
 	return body == character
diff --git a/scripts/player/cam_base.gd b/scripts/player/cam_base.gd
index bcb042a..ecb7e7c 100644
--- a/scripts/player/cam_base.gd
+++ b/scripts/player/cam_base.gd
@@ -20,7 +20,7 @@ var velocity = Vector3(0, 0, 0)
 func _ready():
 	cam_pitch = get_node("cam_pitch")
 	cam_pod = cam_pitch.get_node("cam/cam_pod")
-	character = get_parent().get_node("character")
+	character = get_node("../character")
 	set_process_input(true)
 	set_process(true)
 
diff --git a/scripts/player/character.gd b/scripts/player/character.gd
index 6f606fb..999ae73 100644
--- a/scripts/player/character.gd
+++ b/scripts/player/character.gd
@@ -26,10 +26,10 @@ var on_ground = false
 var jump_held = false
 
 func _ready():
-	camera = get_tree().get_root().get_node("globals").camera
+	camera = globals.camera
 	model = get_node("model")
 	animations = model.get_node("AnimationPlayer")
-	air_timer = get_parent().get_node("air_timer")
+	air_timer = get_node("../air_timer")
 	jump_timer = get_node("../jump_timer")
 	set_fixed_process(true)