diff --git a/player/camera.gd b/player/camera.gd index f98b431..c558b54 100644 --- a/player/camera.gd +++ b/player/camera.gd @@ -28,9 +28,9 @@ func rotate_camera_x(x, delta): func _input(event): if event is InputEventMouseMotion: mouse_velocity = event.relative - elif event.is_action_pressed("zoom_out"): + elif event.is_action_pressed("cam_zoom_out"): current_zoom += 1 - elif event.is_action_pressed("zoom_in"): + elif event.is_action_pressed("cam_zoom_in"): current_zoom -= 1 current_zoom = clamp(current_zoom, zoom_min, zoom_max) diff --git a/project.godot b/project.godot index bd1cd79..a9ffdec 100644 --- a/project.godot +++ b/project.godot @@ -72,12 +72,12 @@ shift_lock={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } -zoom_in={ +cam_zoom_in={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } -zoom_out={ +cam_zoom_out={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null) ]