Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace

Characters/Player/Player.gd

@@ -54,7 +54,7 @@ func _physics_process(delta):
 	process_input()
 	process_movement(delta)
 
-func _process(delta):
+func _process(_delta):
 	check_interact()
 	process_animations()
 
@@ -95,11 +95,7 @@ func process_movement(delta):
 	_vel.y += delta * GRAVITY
 
 	# set movement speed
-	var target = _dir
-	if _is_sprinting:
-		target *= SPRINT_SPEED
-	else:
-		target *= MOVE_SPEED
+	var target = _dir * (SPRINT_SPEED if _is_sprinting else MOVE_SPEED)
 
 	var hvel = _vel
 	hvel = hvel.linear_interpolate(target, ACCEL * delta)

Characters/Player/UI/UI.gd

@@ -17,7 +17,7 @@ func _ready():
 func add_item (name):
 	Logger.info("Adding item \"" + name + "\" to inventory")
 	#TODO: global member for inventory?
-	var text #= Texture.new()
+	var text
 	if name == "Key":
 		text = load("res://Models/key/key.png")
 	elif name == "Keycard":