summaryrefslogtreecommitdiff
path: root/godot/scenes
diff options
context:
space:
mode:
Diffstat (limited to 'godot/scenes')
-rw-r--r--godot/scenes/ballistics/Rocket.gd2
-rw-r--r--godot/scenes/machines/Cannon.tscn2
-rw-r--r--godot/scenes/weapons/pistol.gd2
-rw-r--r--godot/scenes/weapons/rockets.gd2
4 files changed, 4 insertions, 4 deletions
diff --git a/godot/scenes/ballistics/Rocket.gd b/godot/scenes/ballistics/Rocket.gd
index c10b5b5..23e79db 100644
--- a/godot/scenes/ballistics/Rocket.gd
+++ b/godot/scenes/ballistics/Rocket.gd
@@ -47,5 +47,5 @@ remotesync func explode():
func _on_collision(_body):
if is_network_master(): rpc("explode")
-func _on_area_entry(area):
+func _on_area_entry(_area):
pass
diff --git a/godot/scenes/machines/Cannon.tscn b/godot/scenes/machines/Cannon.tscn
index fa787cd..fad5df7 100644
--- a/godot/scenes/machines/Cannon.tscn
+++ b/godot/scenes/machines/Cannon.tscn
@@ -42,7 +42,7 @@ mesh = ExtResource( 3 )
skeleton = NodePath("../..")
[node name="Muzzle" type="Spatial" parent="YawJoint/PitchJoint"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.30877, 0, 0 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.37697, 0, 0 )
[node name="explosion_sound" type="AudioStreamPlayer3D" parent="YawJoint/PitchJoint/Muzzle"]
stream = ExtResource( 2 )
diff --git a/godot/scenes/weapons/pistol.gd b/godot/scenes/weapons/pistol.gd
index 10130a7..6792b33 100644
--- a/godot/scenes/weapons/pistol.gd
+++ b/godot/scenes/weapons/pistol.gd
@@ -60,5 +60,5 @@ func attack1():
if hit.has_method("net_apply_impulse"):
hit.rpc("net_apply_impulse", -150*player_owner.melee_ray.global_transform.basis.z)
-func mouse_input(_m1: float, _m3: float, m2: float) -> void:
+func mouse_input(_m1: float, _m3: float, _m2: float) -> void:
pass
diff --git a/godot/scenes/weapons/rockets.gd b/godot/scenes/weapons/rockets.gd
index fddeded..9d2ec91 100644
--- a/godot/scenes/weapons/rockets.gd
+++ b/godot/scenes/weapons/rockets.gd
@@ -43,5 +43,5 @@ func attack1():
else:
rockets_scene.set_visible(false)
-func mouse_input(_m1: float, _m3: float, m2: float) -> void:
+func mouse_input(_m1: float, _m3: float, _m2: float) -> void:
pass