Squashed commit of the following:

[frog-ninja.git] / asset / character / model / state / shooting_state.gd

diff --git a/asset/character/model/state/shooting_state.gd b/asset/character/model/state/shooting_state.gd
index 351588f35787ecd18937d5ae22ee58ffdd6e53e1..30b117dc509bb9a3f60908f02b0d53106487ca3f 100644 (file)
--- a/asset/character/model/state/shooting_state.gd
+++ b/asset/character/model/state/shooting_state.gd
@@ -17,12 +17,10 @@ func on_enter_state():
                player.energy_points -= energy_toll
                
                var new_bullet: Projectile = bullet.instantiate()
-               new_bullet.last_movement_direction = player.last_movement_vector
                new_bullet.weapon = player.model.weapon_l
+               get_tree().root.add_child(new_bullet, true)
+               
                new_bullet.collision_layer = player.collision_layer
                new_bullet.collision_mask = player.collision_mask
-               
-               # TODO: global_position isn't set right until instance has been added to the scene tree
                new_bullet.global_position = player.model.weapon_l.model.get_bullet_origin()
-               
-               get_tree().root.add_child(new_bullet, true)
+               new_bullet.direction = player.last_movement_vector