Merge pull request #276 from ArturM/master

Default scene doesn't work on Godot 3.2

device/globals/action_menu.gd

@@ -58,8 +58,8 @@ func stop(show_tooltip=true):
 	if vm.tooltip and ProjectSettings.get_setting("escoria/ui/tooltip_follows_mouse") and show_tooltip:
 		vm.hover_rebuild()
 
-func set_position(pos):
-	.set_position(_clamp(pos))
+func set_position(pos, keep_margins=false):
+	.set_position(_clamp(pos), keep_margins)
 
 func _ready():
 	var acts = get_node("actions")

device/globals/global_vm.gd

@@ -19,7 +19,7 @@ var customs = []
 
 var event_queue = []
 
-enum acceptable_inputs {INPUT_NONE INPUT_ALL INPUT_SKIP}
+enum acceptable_inputs {INPUT_NONE, INPUT_ALL, INPUT_SKIP}
 var accept_input = acceptable_inputs.INPUT_ALL
 
 var state_return = 0
@@ -259,7 +259,7 @@ func hover_rebuild():
 		if not item.visible:
 			continue
 
-		assert item.rect
+		assert(item.rect)
 		if item.rect.has_point($"/root".get_mouse_position()):
 			vm.hover_push(item)
 
@@ -298,7 +298,7 @@ func camera_set_target(p_speed, p_target):
 	if not camera:
 		return
 
-	assert typeof(p_target) in [TYPE_VECTOR2, TYPE_ARRAY, TYPE_STRING, TYPE_NIL]
+	assert(typeof(p_target) in [TYPE_VECTOR2, TYPE_ARRAY, TYPE_STRING, TYPE_NIL])
 
 	var target = p_target
 
@@ -325,7 +325,7 @@ func camera_set_target(p_speed, p_target):
 		if not target:
 			report_errors("global_vm", ["Camera target not found: " + cam_target])
 	else:
-		assert typeof(target) == TYPE_VECTOR2
+		assert(typeof(target) == TYPE_VECTOR2)
 
 	# Set state for savegames
 	cam_target = p_target

device/globals/interactive.gd

@@ -29,7 +29,7 @@ func show_highlight():
 		return
 
 	highlight_tooltip = vm.tooltip.duplicate()
-	assert highlight_tooltip != vm.tooltip
+	assert(highlight_tooltip != vm.tooltip)
 
 	var tt_pos = $tooltip_pos.global_position
 	var tt_text = get_tooltip()
@@ -56,7 +56,7 @@ func hide_highlight():
 	if not highlight_tooltip:
 		return
 
-	assert highlight_tooltip.visible
+	assert(highlight_tooltip.visible)
 
 	highlight_tooltip.hide()
 	highlight_tooltip.free()

device/globals/item.gd

@@ -586,8 +586,8 @@ func _find_sprites(p = null):
 
 func update_rect():
 	# Called from inventory.gd when items get sorted
-	assert self.inventory
-	assert area is TextureRect
+	assert(self.inventory)
+	assert(area is TextureRect)
 
 	# Now that we know we are TextureRect, create a Rect2 so we can check `.has_point()` when closing the menu
 	rect = Rect2(area.rect_global_position, area.rect_size)

device/globals/main.gd

@@ -32,7 +32,7 @@ func set_scene(p_scene, run_events=true):
 
 	# Ensure we don't have a regular event running when changing scenes
 	if vm.running_event:
-		assert vm.running_event.ev_name == "load"
+		assert(vm.running_event.ev_name == "load")
 
 	if "events_path" in p_scene and p_scene.events_path and run_events:
 		vm.load_file(p_scene.events_path)

device/globals/npc.gd

@@ -231,7 +231,7 @@ func show_highlight():
 		return
 
 	highlight_tooltip = vm.tooltip.duplicate()
-	assert highlight_tooltip != vm.tooltip
+	assert(highlight_tooltip != vm.tooltip)
 
 	var tt_pos = $"tooltip_pos".global_position
 	var tt_text = get_tooltip()
@@ -258,7 +258,7 @@ func hide_highlight():
 	if not highlight_tooltip:
 		return
 
-	assert highlight_tooltip.visible
+	assert(highlight_tooltip.visible)
 
 	highlight_tooltip.hide()
 	highlight_tooltip.free()

device/globals/tooltip.gd

@@ -133,7 +133,7 @@ func _clamp(tt_pos):
 
 	return tt_pos
 
-func set_position(pos):
+func set_position(pos, keep_margins=false):
 	rect_global_position= _clamp(pos)
 
 func _input(ev):
@@ -148,4 +148,4 @@ func _ready():
 	if not highlight_only:
 		vm.register_tooltip(self)
 
-	set_process_input(false)
+	set_process_input(false)

device/globals/trigger.gd

@@ -87,7 +87,7 @@ func _physics_process(dt):
 func _ready():
 	var conn_err
 
-	assert self is Area2D
+	assert(self is Area2D)
 
 	conn_err = connect("input_event", self, "area_input")
 	if conn_err: