more fixes, still doesn't work

vorlac · Oct 6, 2023 · b3ffbcc · b3ffbcc
1 parent 1fb4f65
commit b3ffbcc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/project/scenes/characters/enemy.tscn b/project/scenes/characters/enemy.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Texture2D" uid="uid://cjlu0wl3qj8dh" path="res://assets/art/topdown/shooter/robot_1/robot1_gun.png" id="1_oue85"]
 
-[node name="Enemy" type="Character"]
+[node name="Enemy" type="Enemy"]
 scale = Vector2(2, 2)
 collision_mask = 8
 platform_on_leave = 2

diff --git a/src/nodes/character/character.hpp b/src/nodes/character/character.hpp
@@ -3,25 +3,26 @@
 #include "nodes/camera.hpp"
 #include "util/attributes.hpp"
 #include "util/bind.hpp"
-#include "util/concepts.hpp"
 #include "util/constants.hpp"
 
+#include <concepts>
+
 #include <godot_cpp/classes/character_body2d.hpp>
-#include <godot_cpp/classes/collision_shape2d.hpp>
-#include <godot_cpp/classes/object.hpp>
-#include <godot_cpp/classes/sprite2d.hpp>
-#include <godot_cpp/variant/variant.hpp>
-#include <godot_cpp/variant/vector2.hpp>
 
 namespace godot
 {
     class Marker2D;
+    class Object;
+    class Vector2;
 }
 
 namespace rl
 {
     class CharacterController;
+}
 
+namespace rl
+{
     class Character : public godot::CharacterBody2D
     {
         GDCLASS(Character, godot::CharacterBody2D);
@@ -66,17 +67,11 @@ namespace rl
             using add_pos_changed_signal_binding_t
                 = pos_changed_signal_t::template add<godot::Object*, godot::Vector2>;
             add_pos_changed_signal_binding_t();
-
-            using spawn_projectile_signal_t
-                = std::type_identity_t<signal_binding<T, event::position_changed>>;
-            using add_spawn_projectile_signal_binding_t
-                = spawn_projectile_signal_t::template add<godot::Object*, godot::Vector2>;
-            add_spawn_projectile_signal_binding_t();
         }
 
         static void _bind_methods()
         {
-            Character::bind_member_functions<Character>();
+            bind_member_functions<Character>();
         }
 
     protected:

diff --git a/src/nodes/character/character_controller.hpp b/src/nodes/character/character_controller.hpp
@@ -59,11 +59,11 @@ namespace rl
                 = character_shoot_signal_t::template add<godot::Object*>;
             add_character_shoot_signal_binding_t();
 
-            // using position_changed_signal_t
-            //     = std::type_identity_t<signal_binding<T, event::position_changed>>;
-            // using add_position_changed_signal_binding_t
-            //     = position_changed_signal_t::template add<godot::Object*, godot::Vector2>;
-            // add_position_changed_signal_binding_t();
+            using position_changed_signal_t
+                = std::type_identity_t<signal_binding<T, event::position_changed>>;
+            using add_position_changed_signal_binding_t
+                = position_changed_signal_t::template add<godot::Object*, godot::Vector2>;
+            add_position_changed_signal_binding_t();
         }
 
         static void _bind_methods();