Relintai/rsc_rpg
1
0
Fork 0
mirror of https://github.com/Relintai/rsc_rpg.git synced 2025-04-22 05:51:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix double instanced gui and camera.

Browse Source
This commit is contained in:
Relintai 2021-05-23 15:42:21 +02:00
parent eb3b783072
commit 609ca78492
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
game/player/Body.gd
View File

@ -63,6 +63,7 @@ var total_down_mouse_delta : Vector2 = Vector2()
var target_movement_direction : Vector2 = Vector2() var target_movement_direction : Vector2 = Vector2()
var camera : Camera2D var camera : Camera2D
var ui : Node
var animation_run : bool = false var animation_run : bool = false
@ -92,7 +93,6 @@ var tile_size : int = 8
func _enter_tree() -> void: func _enter_tree() -> void:
world = get_node(world_path) as Node2D world = get_node(world_path) as Node2D
camera = get_node_or_null("Camera") as Camera2D
character_skeleton = get_node(character_skeleton_path) character_skeleton = get_node(character_skeleton_path)
entity = get_node("..") entity = get_node("..")
@ -575,16 +575,16 @@ func on_c_controlled_changed(val):
_controlled = val _controlled = val
if val: if val:
camera = Camera2D.new() if !camera:
camera = Camera2D.new()
add_child(camera)
camera.zoom = Vector2(0.35, 0.35) camera.zoom = Vector2(0.35, 0.35)
add_child(camera)
camera.current = true camera.current = true
#var uiscn : PackedScene = ResourceLoader.load("res://ui/player_ui/player_ui.tscn") if !ui:
#var ui = uiscn.instance() ui = DataManager.request_instance(DataManager.PLAYER_UI_INSTANCE)
#add_child(ui) add_child(ui)
var ui = DataManager.request_instance(DataManager.PLAYER_UI_INSTANCE)
add_child(ui)
set_process_input(true) set_process_input(true)
set_process_unhandled_input(true) set_process_unhandled_input(true)
@ -593,6 +593,10 @@ func on_c_controlled_changed(val):
camera.queue_free() camera.queue_free()
camera = null camera = null
if ui:
ui.queue_free()
ui = null
set_process_input(false) set_process_input(false)
set_process_unhandled_input(false) set_process_unhandled_input(false)
var nameplatescn : PackedScene = ResourceLoader.load("res://ui/nameplates/NamePlate.tscn") var nameplatescn : PackedScene = ResourceLoader.load("res://ui/nameplates/NamePlate.tscn")